Merge remote-tracking branch 'origin/upstream'
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Sun, 31 Jul 2011 18:04:04 +0000 (20:04 +0200)
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Sun, 31 Jul 2011 18:04:04 +0000 (20:04 +0200)
commit7ece67727dcc1ff7a6634e4b911eeb82ed3eaf45
treeb06cf63fb0c8d01f03c1fb84faa936197029e03f
parent831003156c77c811e7f1fcb65811d1d099587442
parent303351de6d2cb54af27198207ba6c8cef49ecf1a
Merge remote-tracking branch 'origin/upstream'
CMakeLists.txt
src/CMakeLists.txt
src/client.cpp
src/main.cpp
src/mapnode.h