Markus Makela db1ea422a0 Merge branch 'develop' into MAX-324 ...

Conflicts:
	server/core/modutil.c

2015-01-20 04:25:40 +02:00

..

filter

Merge branch 'remove_makefiles' into develop

2015-01-16 18:04:16 +02:00

include

Merge branch 'develop' into MAX-324

2015-01-20 04:25:40 +02:00

monitor

remove makefiles and other garbage

2015-01-14 19:08:24 +02:00

protocol

Merge branch 'develop' into MAX-324

2015-01-20 04:25:40 +02:00

routing

Merge branch 'develop' into MAX-324

2015-01-20 04:25:40 +02:00

CMakeLists.txt

initial implementation of the CMake build system

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