merge with master
authorDariusz Mikulski <dariusz.mikulski@collabora.co.uk>
Thu, 4 Mar 2010 16:30:19 +0000 (17:30 +0100)
committerDariusz Mikulski <dariusz.mikulski@collabora.co.uk>
Thu, 4 Mar 2010 16:30:19 +0000 (17:30 +0100)
commit026f9e4468a9f405aacdfe60110093674c90804f
tree2a96f06eb9bfd3f23162d96b1b164e8eccae24c1
parentee53435db55ef45fd69cba05e82498d758abf34a
parent1f883b46ac52a2d09347c42e88ef730b26d238de
merge with master
Makefile.am
src/game.cc
src/game.h
src/pregame.cc
src/pregame.h