Merge remote-tracking branch 'darkrose/master'
authorPerttu Ahola <celeron55@gmail.com>
Mon, 26 Sep 2011 08:57:28 +0000 (11:57 +0300)
committerPerttu Ahola <celeron55@gmail.com>
Mon, 26 Sep 2011 08:57:28 +0000 (11:57 +0300)
commit0ccc0ac927bdbfcc97c1b5c9d5dc64754946f817
tree0db7c756fbcfd18497dee04578d7cb037b2bd7fa
parent63eca0feb2a08aa15f8be1164c4815a44246a2e6
parent8b875d71d1ab928e9866914b886ff58cf8a38192
Merge remote-tracking branch 'darkrose/master'
src/client.cpp
src/server.cpp