Fix conflicts
authorDariusz Mikulski <dariusz.mikulski@collabora.co.uk>
Fri, 26 Mar 2010 13:48:33 +0000 (14:48 +0100)
committerDariusz Mikulski <dariusz.mikulski@collabora.co.uk>
Fri, 26 Mar 2010 13:48:33 +0000 (14:48 +0100)
commitfb7c318a9e43af8e3ab973eef59e46e50ef28d97
tree7e52305060d0446f3b1692a56a5160ec4c14aa72
parent13297e4570dfdf9c26da033933dbf1798f655450
parentf762693c190939ed76c7059c616f6d196bcc064c
Fix conflicts
Makefile.am
src/telepathy/tpgame.cc
src/telepathy/tpincomingtube.cc
src/telepathy/tpoutgoingtube.cc