From: <no...@gi...> - 2011-01-30 22:49:41
|
Branch: refs/heads/qt Home: https://github.com/Warzone2100/warzone2100 Commit: 27741a2200083a61ef05bb86465ace4eeb2070cd https://github.com/Warzone2100/warzone2100/commit/27741a2200083a61ef05bb86465ace4eeb2070cd Author: Per Inge Mathisen <pe...@wz...> Date: 2011-01-30 (Sun, 30 Jan 2011) Changed paths: M COPYING.NONGPL M data/base/structs/radarsensor.pie M data/base/texpages/bdrops/backdrop4.png M lib/framework/wzglobal.h M lib/netplay/netplay.cpp M lib/netplay/nettypes.cpp M lib/netplay/nettypes.h M lib/sound/playlist.cpp M src/action.cpp M src/combat.cpp M src/data.cpp M src/droid.cpp M src/fpath.cpp M src/ingameop.cpp M src/keybind.cpp M src/levels.cpp M src/main.cpp M src/multiint.cpp M src/multijoin.cpp M src/multiplay.cpp M src/multiplay.h M src/order.cpp M src/order.h M src/orderdef.h M src/scriptai.cpp M src/structure.cpp M tests/Makefile.am R tests/astartest.c M tests/maptest.c A tests/modeltest.c R tests/pointtreetest.c M win32/__BUILD_SCRIPT Log Message: ----------- Merge branch 'master' into qt Conflicts: macosx/Warzone.xcodeproj/project.pbxproj tests/astartest.c |