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)
commit836e43db60ff1f3c9d160d0d58ba5a631c4293fc
tree89096c3ffd4128694542ebdbfabe94b6a618e16d
parent6596e585fe844ce87a957bb7deaf2bf92d828592
parent7e610aece52ad547d4ae263aff5297342d5a4bff
Merge remote-tracking branch 'oblomov/new_input'
src/game.cpp