Fix conflicts
authorDariusz Mikulski <dariusz.mikulski@collabora.co.uk>
Fri, 5 Feb 2010 16:10:15 +0000 (17:10 +0100)
committerDariusz Mikulski <dariusz.mikulski@collabora.co.uk>
Fri, 5 Feb 2010 16:10:15 +0000 (17:10 +0100)
commitb007020185dec5aa921d06255b8c679d561148e3
tree91ce40a8d0c721e516b2a0f0af505d9b7b92f362
parent4e7dab13c773091ae21a29f08d0565b9ac439eea
Fix conflicts
src/game.h
src/maemo5/main.cc
src/pregame.cc