Merge commit '879f7eb04200d7d2c28af565229bf6e3d54274fd' into retry/libosmium

2016-10-03 13:08:59 -04:00
parent 050585bbd9 879f7eb042
commit 5b4e2950d9
208 changed files with 11590 additions and 4051 deletions
@@ -1,2 +1,4 @@
 *.swp
 .ycm_extra_conf.pyc
+/build
+/libosmium-deps