Commit Graph

6 Commits

Author SHA1 Message Date
Konstantin Käfer
214f99673f fix variable shadowing 2014-10-22 18:19:01 +02:00
Konstantin Käfer
33beb081f5 Merge branch 'master' of https://github.com/mapbox/llmr-native
Conflicts:
	src/geometry/debug_font.cpp
2014-02-06 15:14:51 +01:00
artemp
a8fef83564 c++
* use nullptr instead of NULL
2014-02-06 10:39:10 +00:00
Konstantin Käfer
64b072a08e make debug font const 2014-02-06 09:45:14 +01:00
Konstantin Käfer
82c79b7bda remove c99 features
fixes #26
2014-02-03 23:21:50 +01:00
Konstantin Käfer
7983b968d7 move debug font to separate file 2014-01-21 18:02:25 +01:00