Revision: 10280
http://warzone2100.svn.sourceforge.net/warzone2100/?rev=10280&view=rev
Author: cypr
Date: 2010-03-14 17:52:04 +0000 (Sun, 14 Mar 2010)
Log Message:
-----------
Merge remote branch 'origin/master' into newnet
Conflicts:
src/keybind.c
From: Cyp <[email protected]>
Modified Paths:
--------------
branches/newnet/AUTHORS
branches/newnet/Makefile.am
branches/newnet/configure.ac
branches/newnet/data/base/gamedesc.lev
branches/newnet/lib/framework/debug.c
branches/newnet/lib/framework/debug.h
branches/newnet/lib/framework/string_ext.h
branches/newnet/lib/iniparser/dictionary.c
branches/newnet/lib/ivis_opengl/screen.c
branches/newnet/lib/script/stack.c
branches/newnet/po/POTFILES.in
branches/newnet/po/cs.po
branches/newnet/po/da.po
branches/newnet/po/de.po
branches/newnet/po/en_GB.po
branches/newnet/po/es.po
branches/newnet/po/et_EE.po
branches/newnet/po/fi.po
branches/newnet/po/fr.po
branches/newnet/po/fy.po
branches/newnet/po/ga.po
branches/newnet/po/hr.po
branches/newnet/po/it.po
branches/newnet/po/la.po
branches/newnet/po/lt.po
branches/newnet/po/nb.po
branches/newnet/po/nl.po
branches/newnet/po/pl.po
branches/newnet/po/pt.po
branches/newnet/po/pt_BR.po
branches/newnet/po/ro.po
branches/newnet/po/ru.po
branches/newnet/po/sl.po
branches/newnet/po/uk_UA.po
branches/newnet/po/zh_CN.po
branches/newnet/po/zh_TW.po
branches/newnet/src/display.c
branches/newnet/src/droid.c
branches/newnet/src/droid.h
branches/newnet/src/init.c
branches/newnet/src/keybind.c
branches/newnet/src/main.c
branches/newnet/src/mechanics.c
branches/newnet/src/objmem.c
branches/newnet/src/stats.c
branches/newnet/src/wrappers.c
branches/newnet/win32/Warzone2100.vcproj
branches/newnet/win32/libs/devpkg/Makefile
Added Paths:
-----------
branches/newnet/win32/MSVCdelparser.bat
Removed Paths:
-------------
branches/newnet/data/base/components/weapons/projectiles/fxbeam.pie
branches/newnet/data/base/components/weapons/projectiles/fxcammo.pie
branches/newnet/data/base/components/weapons/projectiles/fxfproj.pie
branches/newnet/data/base/components/weapons/projectiles/fxgammo.pie
branches/newnet/data/base/components/weapons/projectiles/fxincend.pie
branches/newnet/data/base/components/weapons/projectiles/fxplammo.pie
branches/newnet/data/base/components/weapons/projectiles/fxscudm.pie
branches/newnet/data/base/components/weapons/projectiles/fxsroc.pie
branches/newnet/data/base/components/weapons/projectiles/fxtracer.pie
branches/newnet/data/base/components/weapons/projectiles/fxtracr2.pie
branches/newnet/data/base/wrf/vidmemc.wrf
branches/newnet/data/mp/wrf/vidmemc.wrf
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
