Revision: 10149
http://warzone2100.svn.sourceforge.net/warzone2100/?rev=10149&view=rev
Author: cypr
Date: 2010-03-04 20:03:28 +0000 (Thu, 04 Mar 2010)
Log Message:
-----------
Merge remote branches 'origin/qt' and 'origin/master' into qt
Conflicts:
configure.ac
lib/ivis_common/piepalette.h
lib/ivis_opengl/screen.c
lib/netplay/nettypes.h
lib/widget/scrap.c
macosx/Warzone.xcodeproj/project.pbxproj
src/Makefile.am
src/data.c
src/main.h
src/multiint.c
src/wrappers.c
From: Cyp <[email protected]>
Modified Paths:
--------------
branches/qt/Makefile.am
branches/qt/configure.ac
branches/qt/data/base/multiplay/script/scavfact.slo
branches/qt/data/mods/multiplay/ntw/stats/assignweapons.txt
branches/qt/data/mods/multiplay/ntw/stats/templates.txt
branches/qt/lib/framework/configfile.c
branches/qt/lib/framework/fixedpoint.h
branches/qt/lib/framework/trig.c
branches/qt/lib/framework/trig.h
branches/qt/lib/framework/vector.h
branches/qt/lib/gamelib/gtime.h
branches/qt/lib/ivis_common/piepalette.h
branches/qt/lib/ivis_opengl/Makefile.am
branches/qt/lib/ivis_opengl/ivis_opengl.vcproj
branches/qt/lib/ivis_opengl/makefile.win32
branches/qt/lib/ivis_opengl/pieblitfunc.c
branches/qt/lib/ivis_opengl/piedraw.c
branches/qt/lib/ivis_opengl/piefunc.c
branches/qt/lib/ivis_opengl/piematrix.c
branches/qt/lib/ivis_opengl/piemode.c
branches/qt/lib/ivis_opengl/piestate.c
branches/qt/lib/ivis_opengl/screen.c
branches/qt/lib/ivis_opengl/tex.c
branches/qt/lib/ivis_opengl/textdraw.c
branches/qt/lib/netplay/netplay.c
branches/qt/lib/netplay/netplay.h
branches/qt/lib/netplay/nettypes.c
branches/qt/lib/netplay/nettypes.h
branches/qt/lib/sequence/Makefile.am
branches/qt/lib/sequence/makefile.win32
branches/qt/lib/sequence/sequence.c
branches/qt/lib/sequence/sequence.vcproj
branches/qt/lib/sound/aud.h
branches/qt/macosx/configs/Warzone-Debug.xcconfig
branches/qt/po/cs.po
branches/qt/po/da.po
branches/qt/po/de.po
branches/qt/po/en_GB.po
branches/qt/po/es.po
branches/qt/po/et_EE.po
branches/qt/po/fi.po
branches/qt/po/fr.po
branches/qt/po/fy.po
branches/qt/po/ga.po
branches/qt/po/hr.po
branches/qt/po/it.po
branches/qt/po/la.po
branches/qt/po/lt.po
branches/qt/po/nb.po
branches/qt/po/nl.po
branches/qt/po/pl.po
branches/qt/po/pt.po
branches/qt/po/pt_BR.po
branches/qt/po/ro.po
branches/qt/po/ru.po
branches/qt/po/sl.po
branches/qt/po/uk_UA.po
branches/qt/po/zh_CN.po
branches/qt/po/zh_TW.po
branches/qt/src/Makefile.am
branches/qt/src/action.c
branches/qt/src/ai.c
branches/qt/src/astar.c
branches/qt/src/atmos.c
branches/qt/src/atmos.h
branches/qt/src/aud.c
branches/qt/src/basedef.h
branches/qt/src/baseobject.c
branches/qt/src/baseobject.h
branches/qt/src/challenge.c
branches/qt/src/cheat.c
branches/qt/src/cheat.h
branches/qt/src/clparse.c
branches/qt/src/clparse.h
branches/qt/src/cluster.c
branches/qt/src/cluster.h
branches/qt/src/combat.c
branches/qt/src/combat.h
branches/qt/src/component.c
branches/qt/src/configuration.c
branches/qt/src/configuration.h
branches/qt/src/console.h
branches/qt/src/data.c
branches/qt/src/data.h
branches/qt/src/difficulty.c
branches/qt/src/difficulty.h
branches/qt/src/display.c
branches/qt/src/display3d.c
branches/qt/src/display3d.h
branches/qt/src/drive.c
branches/qt/src/droid.c
branches/qt/src/droid.h
branches/qt/src/droiddef.h
branches/qt/src/e3demo.c
branches/qt/src/e3demo.h
branches/qt/src/effects.c
branches/qt/src/feature.c
branches/qt/src/formation.c
branches/qt/src/formation.h
branches/qt/src/formationdef.h
branches/qt/src/fpath.c
branches/qt/src/fpath.h
branches/qt/src/frontend.c
branches/qt/src/game.c
branches/qt/src/gateway.c
branches/qt/src/geometry.c
branches/qt/src/geometry.h
branches/qt/src/group.c
branches/qt/src/group.h
branches/qt/src/init.c
branches/qt/src/intimage.c
branches/qt/src/intimage.h
branches/qt/src/keybind.c
branches/qt/src/main.h
branches/qt/src/makefile.win32
branches/qt/src/map.c
branches/qt/src/map.h
branches/qt/src/mission.c
branches/qt/src/move.c
branches/qt/src/movedef.h
branches/qt/src/multibot.c
branches/qt/src/multigifts.c
branches/qt/src/multiint.c
branches/qt/src/multiint.h
branches/qt/src/multilimit.c
branches/qt/src/multimenu.c
branches/qt/src/multiplay.c
branches/qt/src/multiplay.h
branches/qt/src/multistruct.c
branches/qt/src/multisync.c
branches/qt/src/oprint.c
branches/qt/src/order.c
branches/qt/src/orderdef.h
branches/qt/src/projectile.c
branches/qt/src/projectile.h
branches/qt/src/raycast.c
branches/qt/src/raycast.h
branches/qt/src/scriptai.c
branches/qt/src/scriptfuncs.c
branches/qt/src/structure.c
branches/qt/src/structure.h
branches/qt/src/texture.c
branches/qt/src/transporter.c
branches/qt/src/visibility.c
branches/qt/src/warcam.c
branches/qt/src/wavecast.cpp
branches/qt/src/weapondef.h
branches/qt/src/wrappers.c
branches/qt/src/wrappers.h
branches/qt/win32/Warzone2100.vs2k8.vcproj
Added Paths:
-----------
branches/qt/macosx/configs/FetchPrebuilt.sh
branches/qt/macosx/configs/FetchSource.sh
branches/qt/macosx/configs/bison.sh
branches/qt/win32/libs/sdl/patches/001-Fix-cursor-not-being-responsive-without-SDL_APPINPUTFOCUS.diff
Removed Paths:
-------------
branches/qt/macosx/external/bison.sh
branches/qt/win32/libs/sdl/patches/001-Fix-to-the-cursor-not-being-responsive-when-the-app-doesn't-have-SDL_APPINPUTFOCUS.diff
branches/qt/win32/libs/sdl/patches/001-iconv-preprocessor-fix.diff
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
