Merge branch 'bugfixes'
authorautomerge <cron@wz2100.net>
Fri, 24 Aug 2012 06:00:16 +0000 (08:00 +0200)
committercybersphinx <chr.ohm@gmx.net>
Fri, 24 Aug 2012 06:00:16 +0000 (08:00 +0200)
commit590adfd053ffc3fe97789864e9cd37de2ffe165e
tree2f07f3fa067d9abb7c82a525977b96d1e6534f04
parent5801ca7345c15f2ea05b764949f533ff40e29401
parent5bac6e4273fbdbd43acaf4a0042b373d4c9dec7c
Merge branch 'bugfixes'
src/multiplay.cpp
src/multiplay.h
src/qtscriptfuncs.cpp