Markus Makela 1b0fd4576a Merge branch 'maxinfo' into develop ...

Conflicts:
	server/core/service.c
	server/core/session.c
	server/include/session.h

2015-03-04 11:33:00 +02:00

..

filter

Added match and ignore regex for lagfilter.

2015-03-04 05:20:41 +02:00

include

Merge branch 'maxinfo' into develop

2015-03-04 11:33:00 +02:00

monitor

Added MM monitor to the set of modules that are built.

2015-02-24 16:22:34 +02:00

protocol

Merge branch 'maxinfo' into develop

2015-03-04 11:33:00 +02:00

routing

Merge branch 'maxinfo' into develop

2015-03-04 11:33:00 +02:00

CMakeLists.txt

initial implementation of the CMake build system

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