Revision: 10146
http://warzone2100.svn.sourceforge.net/warzone2100/?rev=10146&view=rev
Author: cypr
Date: 2010-03-04 19:44:24 +0000 (Thu, 04 Mar 2010)
Log Message:
-----------
Merge remote branch 'origin/master' into qt
Conflicts:
macosx/Warzone.xcodeproj/project.pbxproj
From: Cyp <[email protected]>
Modified Paths:
--------------
branches/qt/configure.ac
branches/qt/data/mods/multiplay/Makefile.am
branches/qt/data/mods/multiplay/makefile.win32
branches/qt/data/mods/multiplay/ntw/messages/strings/names.txt
branches/qt/data/mods/multiplay/ntw/multiplay/script/autoenable.slo
branches/qt/data/mods/multiplay/ntw/multiplay/script/autoenable.vlo
branches/qt/data/mods/multiplay/ntw/stats/body.txt
branches/qt/data/mods/multiplay/ntw/stats/research/multiplayer/prresearch.txt
branches/qt/data/mods/multiplay/ntw/stats/research/multiplayer/research.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/wrf/multi/campaign-scav.wrf
branches/qt/data/mods/multiplay/ntw/wrf/multi/campaign-scav2.wrf
branches/qt/data/mods/multiplay/ntw/wrf/multi/campaign-scav3.wrf
branches/qt/data/mods/multiplay/ntw/wrf/multi/campaign.wrf
branches/qt/data/mods/multiplay/ntw/wrf/multi/campaign2.wrf
branches/qt/data/mods/multiplay/ntw/wrf/multi/campaign3.wrf
branches/qt/data/mods/multiplay/ntw/wrf/multi/skirmish2.wrf
branches/qt/data/mods/multiplay/ntw/wrf/multi/skirmish4.wrf
branches/qt/data/mods/multiplay/ntw/wrf/multi/skirmish8.wrf
branches/qt/data/mods/multiplay/ntw/wrf/multi/t2-skirmish2.wrf
branches/qt/data/mods/multiplay/ntw/wrf/multi/t2-skirmish4.wrf
branches/qt/data/mods/multiplay/ntw/wrf/multi/t2-skirmish8.wrf
branches/qt/data/mods/multiplay/ntw/wrf/multi/t3-skirmish2.wrf
branches/qt/data/mods/multiplay/ntw/wrf/multi/t3-skirmish4.wrf
branches/qt/data/mods/multiplay/ntw/wrf/multi/t3-skirmish8.wrf
branches/qt/data/mp/messages/strings/names.txt
branches/qt/data/mp/stats/research/multiplayer/prresearch.txt
branches/qt/data/mp/stats/research/multiplayer/redcomponents.txt
branches/qt/data/mp/stats/research/multiplayer/research.txt
branches/qt/data/mp/stats/weapons.txt
branches/qt/lib/exceptionhandler/dumpinfo.cpp
branches/qt/lib/netplay/netplay.c
branches/qt/lib/netplay/netplay.h
branches/qt/pkg/nsis/warzone2100.nsi
branches/qt/po/pl.po
branches/qt/src/droid.c
branches/qt/src/multiint.c
branches/qt/src/projectile.c
Added Paths:
-----------
branches/qt/data/mods/multiplay/dydo-ai/
branches/qt/data/mods/multiplay/dydo-ai/images/
branches/qt/data/mods/multiplay/dydo-ai/images/avatar.png
branches/qt/data/mods/multiplay/dydo-ai/images/frontend0.png
branches/qt/data/mods/multiplay/dydo-ai/messages/
branches/qt/data/mods/multiplay/dydo-ai/messages/multiplay.txt
branches/qt/data/mods/multiplay/dydo-ai/messages/strings/
branches/qt/data/mods/multiplay/dydo-ai/messages/strings/names.txt
branches/qt/data/mods/multiplay/dydo-ai/multiplay/
branches/qt/data/mods/multiplay/dydo-ai/multiplay/skirmish/
branches/qt/data/mods/multiplay/dydo-ai/multiplay/skirmish/player0.slo
branches/qt/data/mods/multiplay/dydo-ai/multiplay/skirmish/player0.vlo
branches/qt/data/mods/multiplay/dydo-ai/multiplay/skirmish/player1.slo
branches/qt/data/mods/multiplay/dydo-ai/multiplay/skirmish/player1.vlo
branches/qt/data/mods/multiplay/dydo-ai/multiplay/skirmish/player2.slo
branches/qt/data/mods/multiplay/dydo-ai/multiplay/skirmish/player2.vlo
branches/qt/data/mods/multiplay/dydo-ai/multiplay/skirmish/player3.slo
branches/qt/data/mods/multiplay/dydo-ai/multiplay/skirmish/player3.vlo
branches/qt/data/mods/multiplay/dydo-ai/multiplay/skirmish/player4.slo
branches/qt/data/mods/multiplay/dydo-ai/multiplay/skirmish/player4.vlo
branches/qt/data/mods/multiplay/dydo-ai/multiplay/skirmish/player5.slo
branches/qt/data/mods/multiplay/dydo-ai/multiplay/skirmish/player5.vlo
branches/qt/data/mods/multiplay/dydo-ai/multiplay/skirmish/player6.slo
branches/qt/data/mods/multiplay/dydo-ai/multiplay/skirmish/player6.vlo
branches/qt/data/mods/multiplay/dydo-ai/multiplay/skirmish/player7.slo
branches/qt/data/mods/multiplay/dydo-ai/multiplay/skirmish/player7.vlo
branches/qt/data/mods/multiplay/dydo-ai/multiplay/skirmish/readme.txt
branches/qt/data/mods/multiplay/dydo-ai/multiplay/skirmish/rules.slo
branches/qt/data/mods/multiplay/dydo-ai/multiplay/skirmish/rules.vlo
branches/qt/data/mods/multiplay/dydo-ai/multiplay/skirmish/sk2tech.vlo
branches/qt/data/mods/multiplay/dydo-ai/multiplay/skirmish/sk3tech.vlo
branches/qt/data/mods/multiplay/dydo-ai/multiplay/skirmish/sktech.slo
branches/qt/data/mods/multiplay/dydo-ai/stats/
branches/qt/data/mods/multiplay/dydo-ai/stats/assignweapons.txt
branches/qt/data/mods/multiplay/dydo-ai/stats/body.txt
branches/qt/data/mods/multiplay/dydo-ai/stats/templates.txt
branches/qt/m4/stack-protector.m4
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
