Merging develop branch into master for v0.3.4 release

Update README.TXT
Merge pull request #628 from springmeyer/scons-clang-avoid-exit
2013-06-28 10:30:34 -04:00 · 2013-06-15 22:07:07 +03:00 · 2013-05-14 13:04:40 -07:00 · 2013-05-14 11:42:38 -07:00 · 2013-03-01 10:31:02 +01:00 · 2012-12-26 18:37:57 +01:00
1 changed files with 21 additions and 1 deletions
@@ -4,4 +4,24 @@ https://github.com/DennisOSRM/Project-OSRM/wiki

 or use our free and daily updated online service at

-http://map.project-osrm.org
+http://map.project-osrm.org
+
+When using the code in a scientific publication, please cite
+
+@inproceedings{luxen-vetter-2011,
+ author = {Luxen, Dennis and Vetter, Christian},
+ title = {Real-time routing with OpenStreetMap data},
+ booktitle = {Proceedings of the 19th ACM SIGSPATIAL International Conference on Advances in Geographic Information Systems},
+ series = {GIS '11},
+ year = {2011},
+ isbn = {978-1-4503-1031-4},
+ location = {Chicago, Illinois},
+ pages = {513--516},
+ numpages = {4},
+ url = {http://doi.acm.org/10.1145/2093973.2094062},
+ doi = {10.1145/2093973.2094062},
+ acmid = {2094062},
+ publisher = {ACM},
+ address = {New York, NY, USA},
+} 
+
Author	SHA1	Message	Date
Dennis Luxen	828b370ea1	Merging develop branch into master for v0.3.4 release	2013-06-28 10:30:34 -04:00
Dennis Luxen	b757bd0ea2	Update README.TXT	2013-06-15 22:07:07 +03:00
Dennis Luxen	cc73ed19b3	Merge pull request #628 from springmeyer/scons-clang-avoid-exit Allow configure to work with clang and openmp disabled	2013-05-14 13:04:40 -07:00
Dane Springmeyer	ccb7cc40df	allow configure to work with clang and openmp disabled	2013-05-14 11:42:38 -07:00
DennisOSRM	42b68fa834	Merging changes for 0.3.3	2013-03-01 10:31:02 +01:00
DennisOSRM	f9ab8426ce	Merging changes for 0.3.2	2012-12-26 18:37:57 +01:00
Dennis Luxen	6574436c33	Merge branch 'develop'	2012-12-24 10:35:51 +01:00
Dennis Luxen	824724630f	Reomving the Travis CI experiment	2012-12-08 23:19:59 +01:00
Dennis Luxen	85c5da8512	removing --with-tools flag for travic CI	2012-12-08 21:10:24 +01:00
Dennis Luxen	d79ebabe03	cuke dependencies for travic CI	2012-12-08 20:42:24 +01:00
Dennis Luxen	f9cab44bc1	Adding irc config for Travis CI build server	2012-12-08 16:28:30 +01:00
Dennis Luxen	636f69b29f	Adding config for Travis CI build server	2012-12-08 16:25:45 +01:00