Markus Makela 6497350ab7 Merge branch 'release-1.2' into develop ...

Conflicts:
	server/core/adminusers.c
	server/modules/protocol/mysql_client.c

2015-07-11 17:12:48 +03:00

..

filter

Added missing namedserverfilter documentation.

2015-07-10 13:51:32 +03:00

include

Merge remote-tracking branch 'origin/develop' into MXS-122

2015-07-08 14:54:22 +01:00

monitor

Fix to MXS-227: https://mariadb.atlassian.net/browse/MXS-227

2015-06-29 19:17:12 +03:00

protocol

Merge branch 'release-1.2' into develop

2015-07-11 17:12:48 +03:00

routing

Merge branch 'release-1.2' into develop

2015-07-11 17:12:48 +03:00

CMakeLists.txt

initial implementation of the CMake build system

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