Markus Makela 0134fdc397 Merge branch 'release-1.2' into develop ...

Conflicts:
	server/core/dbusers.c

2015-07-13 15:52:36 +03:00

..

filter

Added missing namedserverfilter documentation.

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

include

Merge branch 'release-1.2' into develop

2015-07-13 15:52:36 +03:00

monitor

Added galeramon server priorities.

2015-07-13 14:39:04 +03:00

protocol

Fixed missing return values.

2015-07-11 19:02:01 +03:00

routing

Merge branch 'release-1.2' into develop

2015-07-13 15:52:36 +03:00

CMakeLists.txt

initial implementation of the CMake build system

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