Fix conflicts p2p-telepathy
authorMichael Hasselmann <michael@taschenorakel.de>
Mon, 5 Apr 2010 20:49:13 +0000 (23:49 +0300)
committerMichael Hasselmann <michael@taschenorakel.de>
Mon, 5 Apr 2010 20:52:06 +0000 (23:52 +0300)
commit943dbfa230d4ef77003ad41f5625e51ca873eb2e
tree839ee265d85f2f4725f59c0e7ab1b32316469449
parenta6a66c4648590af7583a0be92428c5ea08cce572
parent71bb5ada309ca8197ea8ae7b5fc4f78ea71afbcd
Fix conflicts
Makefile.am
debian/control
src/game.cc
src/game.h
src/game_log.cc
src/pregame.cc