Merge remote-tracking branch 'queatz/sqlite-map'
authorPerttu Ahola <celeron55@gmail.com>
Tue, 6 Sep 2011 15:04:02 +0000 (18:04 +0300)
committerPerttu Ahola <celeron55@gmail.com>
Tue, 6 Sep 2011 15:04:02 +0000 (18:04 +0300)
1  2 
src/map.cpp

diff --cc src/map.cpp
Simple merge