Merge branch 'develop' into MAX-324

2015-03-05 10:45:48 +02:00
parent 561952e1ea d6da4c7501
commit 880adca73e
57 changed files with 4699 additions and 113 deletions
--- a/server/modules/routing/CMakeLists.txt
+++ b/server/modules/routing/CMakeLists.txt
@ -30,4 +30,5 @@ add_subdirectory(schemarouter/test)
 if(BUILD_BINLOG)
  add_subdirectory(binlog)
 endif()
+add_subdirectory(maxinfo)