rebase branch onto latest develop, report changes. hurt a little

2014-12-17 19:02:48 +01:00
parent 06f82d5e8a
commit 6da33cafe5
12 changed files with 496 additions and 504 deletions
@@ -30,10 +30,6 @@ namespace boost { namespace interprocess { class named_mutex; } }
 #include "OSRM_impl.h"
 #include "OSRM.h"

-#include <osrm/Reply.h>
-#include <osrm/RouteParameters.h>
-#include <osrm/ServerPaths.h>
-
 #include "../plugins/distance_table.hpp"
 #include "../plugins/hello_world.hpp"
 #include "../plugins/locate.hpp"