Revision: 10375
http://warzone2100.svn.sourceforge.net/warzone2100/?rev=10375&view=rev
Author: cypr
Date: 2010-03-20 15:40:05 +0000 (Sat, 20 Mar 2010)
Log Message:
-----------
Merge remote branch 'origin/master' into qt
Conflicts:
lib/framework/types.h
macosx/Warzone.xcodeproj/project.pbxproj (Unmerged, used qt branch
version.)
From: Cyp <c...@example.com>
Modified Paths:
--------------
branches/qt/data/mods/multiplay/ntw/audio/multi/lasstrk.ogg
branches/qt/data/mods/multiplay/ntw/doc/readme.txt
branches/qt/data/mods/multiplay/ntw/messages/strings/names.txt
branches/qt/data/mods/multiplay/ntw/multiplay/script/cam3tech.vlo
branches/qt/data/mods/multiplay/ntw/multiplay/script/multilim.slo
branches/qt/data/mods/multiplay/ntw/multiplay/script/multilim.vlo
branches/qt/data/mods/multiplay/ntw/multiplay/skirmish/player0.vlo
branches/qt/data/mods/multiplay/ntw/multiplay/skirmish/player1.vlo
branches/qt/data/mods/multiplay/ntw/multiplay/skirmish/player2.vlo
branches/qt/data/mods/multiplay/ntw/multiplay/skirmish/player3.vlo
branches/qt/data/mods/multiplay/ntw/multiplay/skirmish/player4.vlo
branches/qt/data/mods/multiplay/ntw/multiplay/skirmish/player5.vlo
branches/qt/data/mods/multiplay/ntw/multiplay/skirmish/player6.vlo
branches/qt/data/mods/multiplay/ntw/multiplay/skirmish/player7.vlo
branches/qt/data/mods/multiplay/ntw/multiplay/skirmish/sk3tech.vlo
branches/qt/data/mods/multiplay/ntw/stats/research/multiplayer/prresearch.txt
branches/qt/data/mods/multiplay/ntw/stats/research/multiplayer/redcomponents.txt
branches/qt/data/mods/multiplay/ntw/stats/research/multiplayer/redstructure.txt
branches/qt/data/mods/multiplay/ntw/stats/research/multiplayer/research.txt
branches/qt/data/mods/multiplay/ntw/stats/research/multiplayer/resultcomponent.txt
branches/qt/data/mods/multiplay/ntw/stats/research/multiplayer/resultstructure.txt
branches/qt/data/mods/multiplay/ntw/stats/structures.txt
branches/qt/data/mods/multiplay/ntw/stats/structureweapons.txt
branches/qt/data/mods/multiplay/ntw/stats/weapons.txt
branches/qt/data/mods/multiplay/ntw/stats/weaponsounds.txt
branches/qt/data/mods/multiplay/ntw/structs/blpower4.pie
branches/qt/data/mods/multiplay/ntw/structs/shield.pie
branches/qt/data/mods/multiplay/ntw/wrf/piestats.wrf
branches/qt/lib/framework/frame.h
branches/qt/lib/framework/types.h
branches/qt/lib/framework/wzapp.cpp
branches/qt/lib/ivis_common/piefunc.h
branches/qt/lib/ivis_opengl/piefunc.c
branches/qt/lib/ivis_opengl/screen.c
branches/qt/lib/netplay/makefile.win32
branches/qt/lib/netplay/netplay.vcproj
branches/qt/lib/netplay/netsocket.cpp
branches/qt/lib/netplay/netsocket.h
branches/qt/po/pl.po
branches/qt/src/cheat.c
branches/qt/src/clparse.c
branches/qt/src/display3d.c
branches/qt/src/display3d.h
branches/qt/src/droid.c
branches/qt/src/hci.c
branches/qt/src/keybind.c
branches/qt/src/keybind.h
branches/qt/src/levels.c
branches/qt/src/radar.c
branches/qt/src/radar.h
branches/qt/tools/3ds2pie/3ds2pie_gui.cpp
branches/qt/tools/3ds2pie/3ds2pie_gui.pro
branches/qt/tools/3ds2pie/3ds2pie_gui.ui
Added Paths:
-----------
branches/qt/data/mods/multiplay/ntw/images/frontend2.png
branches/qt/data/mods/multiplay/ntw/images/frontend3.png
branches/qt/data/mods/multiplay/ntw/images/frontend4.png
branches/qt/data/mods/multiplay/ntw/images/intfac1.png
branches/qt/data/mods/multiplay/ntw/images/intfac2.png
branches/qt/data/mods/multiplay/ntw/images/intfac4.png
branches/qt/data/mods/multiplay/ntw/images/intfac5.png
branches/qt/data/mods/multiplay/ntw/structs/shield2.pie
branches/qt/tools/3ds2pie/3ds2pie.cpp
branches/qt/tools/3ds2pie/3ds2pie.h
Removed Paths:
-------------
branches/qt/tools/3ds2pie/3ds2pie.c
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
