Author: gerard_
Date: Sat Feb 21 23:04:51 2009
New Revision: 6676
URL: http://svn.gna.org/viewcvs/warzone?rev=6676&view=rev
Log:
Merge r6623 through r6675 from trunk (except po/it.po) in preparation for
merging the terrain branch back into trunk.
Removed:
branches/terrain/build_tools/code-generators/test_code.tpl
branches/terrain/build_tools/code-generators/test_code.tpl.sql.c
branches/terrain/build_tools/code-generators/test_code.tpl.struct.h
branches/terrain/src/gatewaydef.h
Modified:
branches/terrain/build_tools/code-generators/c_sqliteload_cg.pm
branches/terrain/build_tools/code-generators/sql_tabledef_cg.pm
branches/terrain/data/base/images/intfac.img
branches/terrain/data/base/images/intfac5.png
branches/terrain/data/base/stats-sql/stats-db2.data.sql
branches/terrain/data/base/stats-sql/stats-db2.schema.sql
branches/terrain/data/base/stats-sql/stats.db
branches/terrain/data/base/stats/propulsion.txt
branches/terrain/data/makefile.win32
branches/terrain/data/mp/messages/strings/names.txt
branches/terrain/data/mp/stats/propulsion.txt
branches/terrain/lib/betawidget/src/clipboard.h
branches/terrain/lib/framework/frame.h
branches/terrain/lib/framework/framework.vcproj
branches/terrain/lib/framework/makefile.win32
branches/terrain/lib/framework/physfs_ext.h
branches/terrain/lib/framework/stdio_ext.c
branches/terrain/lib/framework/vector.h
branches/terrain/lib/gamelib/gamelib.vcproj
branches/terrain/lib/gamelib/makefile.win32
branches/terrain/lib/ivis_common/ivis_common.vcproj
branches/terrain/lib/ivis_opengl/GLee.c
branches/terrain/lib/ivis_opengl/GLee.diff
branches/terrain/lib/ivis_opengl/GLee.h
branches/terrain/lib/netplay/netplay.c
branches/terrain/lib/script/makefile.win32
branches/terrain/lib/script/script.vcproj
branches/terrain/macosx/Warzone.xcodeproj/project.pbxproj
branches/terrain/pkg/nsis/Makefile.am
branches/terrain/pkg/nsis/warzone2100.nsi
branches/terrain/pkg/nsis/warzone2100.update.nsi
branches/terrain/po/POTFILES.in
branches/terrain/po/cs.po
branches/terrain/po/da.po
branches/terrain/po/de.po
branches/terrain/po/en_GB.po
branches/terrain/po/es.po
branches/terrain/po/fi.po
branches/terrain/po/fr.po
branches/terrain/po/fy.po
branches/terrain/po/ga.po
branches/terrain/po/la.po
branches/terrain/po/lt.po
branches/terrain/po/nb.po
branches/terrain/po/nl.po
branches/terrain/po/pl.po
branches/terrain/po/pt.po
branches/terrain/po/pt_BR.po
branches/terrain/po/ro.po
branches/terrain/po/ru.po
branches/terrain/po/zh_CN.po
branches/terrain/src/Makefile.am
branches/terrain/src/action.c
branches/terrain/src/action.h
branches/terrain/src/cheat.c
branches/terrain/src/combat.c
branches/terrain/src/configuration.c
branches/terrain/src/display.c
branches/terrain/src/display3ddef.h
branches/terrain/src/droid.c
branches/terrain/src/effects.c
branches/terrain/src/effects.h
branches/terrain/src/fpath.c
branches/terrain/src/function.c
branches/terrain/src/game.c
branches/terrain/src/gateway.c
branches/terrain/src/gateway.h
branches/terrain/src/hci.c
branches/terrain/src/keybind.c
branches/terrain/src/map.c
branches/terrain/src/map.h
branches/terrain/src/mission.c
branches/terrain/src/mission.h
branches/terrain/src/missiondef.h
branches/terrain/src/move.c
branches/terrain/src/multibot.c
branches/terrain/src/multigifts.c
branches/terrain/src/multiint.c
branches/terrain/src/multijoin.c
branches/terrain/src/multiplay.c
branches/terrain/src/multiplay.h
branches/terrain/src/multisync.c
branches/terrain/src/scores.c
branches/terrain/src/scriptfuncs.c
branches/terrain/src/stats-db2.c
branches/terrain/src/stats-db2.tpl
branches/terrain/src/warzoneconfig.c
branches/terrain/src/weapondef.h
branches/terrain/win32/Warzone2100.vcproj
_______________________________________________
Warzone-commits mailing list
[email protected]
https://mail.gna.org/listinfo/warzone-commits
