Merge remote-tracking branch 'oblomov/new_input'
authorPerttu Ahola <celeron55@gmail.com>
Mon, 22 Aug 2011 11:46:52 +0000 (14:46 +0300)
committerPerttu Ahola <celeron55@gmail.com>
Mon, 22 Aug 2011 11:46:52 +0000 (14:46 +0300)
1  2 
src/game.cpp

diff --cc src/game.cpp
Simple merge