Markus Makela 75117f2482 Merge branch 'develop' into firewall ...

Conflicts:
	server/modules/filter/CMakeLists.txt

2014-10-12 10:13:54 +03:00

..

filter

Merge branch 'develop' into firewall

2014-10-12 10:13:54 +03:00

include

Updated the licensing year from 2013 to 2013-2014

2014-10-01 14:37:12 +03:00

monitor

Updated non-source files with new company name.

2014-10-01 15:21:47 +03:00

protocol

Completing fix to bug #565, http://bugs.mariadb.com/show_bug.cgi?id=565

2014-10-09 16:37:26 +03:00

routing

Included the my_config.h header before any system headers if mysql headers were used.

2014-10-10 12:30:21 +03:00

CMakeLists.txt

initial implementation of the CMake build system

2014-09-11 18:24:41 +03:00