merge conflict CMakeLists.txt

2013-07-09 13:38:44 +02:00
parent 7ebe6de022 80b9afc14d
commit 51a7d3ff50
70 changed files with 946 additions and 1449 deletions
@@ -72,6 +72,7 @@ stxxl.errlog
 /osrm-extract
 /osrm-routed
 /osrm-prepare
+/osrm-cli
 /nohup.out

 # Sandbox folder #