Author: muggenhor
Date: Sun May 25 13:57:53 2008
New Revision: 5174

URL: http://svn.gna.org/viewcvs/warzone?rev=5174&view=rev
Log:
Merged revisions r4012:4202 into the 2.1 branch via svnmerge from trunk

Added:
    branches/lua/data/stats-sql/data/   (props changed)
      - copied from r4202, trunk/data/stats-sql/data/
    branches/lua/data/stats-sql/schema/   (props changed)
      - copied from r4202, trunk/data/stats-sql/schema/
    branches/lua/pkg/   (props changed)
      - copied from r4202, trunk/pkg/
Removed:
    branches/lua/data/images/frend.img
    branches/lua/data/images/frend0.png
    branches/lua/data/images/frend1.png
    branches/lua/data/images/frend2.png
    branches/lua/data/images/frend3.png
    branches/lua/data/images/frend4.png
    branches/lua/data/mods/global/aivolution/installation.txt
    branches/lua/data/stats-sql/body-data.sql
    branches/lua/data/stats-sql/brain-data.sql
    branches/lua/data/stats-sql/construction-data.sql
    branches/lua/data/stats-sql/ecm-data.sql
    branches/lua/data/stats-sql/sensor-data.sql
    branches/lua/data/stats-sql/structures-data.sql
    branches/lua/data/stats-sql/structureweapons-data.sql
    branches/lua/data/stats-sql/weapons-data.sql
    branches/lua/data/texpages/bdrops/00-bdrop.png
    branches/lua/data/texpages/bdrops/01-bdrop.png
    branches/lua/data/texpages/bdrops/02-bdrop.png
    branches/lua/data/texpages/bdrops/03-bdrop.png
    branches/lua/data/texpages/bdrops/04-bdrop.png
    branches/lua/data/texpages/bdrops/05-bdrop.png
    branches/lua/data/texpages/bdrops/06-bdrop.png
    branches/lua/data/texpages/bdrops/07-bdrop.png
    branches/lua/data/texpages/bdrops/wzlogo_0.png
    branches/lua/data/texpages/bdrops/wzlogo_1.png
    branches/lua/data/texpages/bdrops/wzlogo_2.png
    branches/lua/data/texpages/bdrops/wzlogo_3.png
    branches/lua/data/texpages/bdrops/wzlogo_4.png
    branches/lua/packaging/
Modified:
    branches/lua/   (props changed)
    branches/lua/COPYING.README
    branches/lua/ChangeLog
    branches/lua/Doxyfile
    branches/lua/Makefile.am
    branches/lua/Makefile.raw
    branches/lua/build_tools/autorevision/autorevision.vcproj   (contents, 
props changed)
    branches/lua/configure.ac
    branches/lua/data/mods/global/Makefile.am
    branches/lua/data/mods/global/Makefile.raw
    branches/lua/data/mods/global/aivolution/commands.txt
    branches/lua/data/mods/global/aivolution/multiplay/skirmish/player0.slo
    branches/lua/data/mods/global/grim/wrf/frontend.wrf
    branches/lua/data/mp/wrf/frontend.wrf
    branches/lua/data/stats-sql/stats.db
    branches/lua/data/wrf/frontend.wrf
    branches/lua/data/wrf/stats.wrf
    branches/lua/lib/framework/Makefile.am
    branches/lua/lib/framework/Makefile.raw
    branches/lua/lib/framework/configfile.c
    branches/lua/lib/framework/debug.h
    branches/lua/lib/framework/frame.c
    branches/lua/lib/framework/frame.h
    branches/lua/lib/framework/frameresource.c
    branches/lua/lib/framework/frameresource.h
    branches/lua/lib/framework/framework.vcproj   (contents, props changed)
    branches/lua/lib/framework/input.c
    branches/lua/lib/framework/printf_ext.h
    branches/lua/lib/framework/resource_lexer.l
    branches/lua/lib/framework/strres.c
    branches/lua/lib/framework/strres_lexer.l
    branches/lua/lib/framework/tagfile.c
    branches/lua/lib/framework/tagfile.h
    branches/lua/lib/gamelib/gamelib.vcproj   (contents, props changed)
    branches/lua/lib/gamelib/parser.h
    branches/lua/lib/ivis_common/bitimage.c
    branches/lua/lib/ivis_common/bitimage.h
    branches/lua/lib/ivis_common/imd.c
    branches/lua/lib/ivis_common/imdload.c
    branches/lua/lib/ivis_common/ivis_common.vcproj   (contents, props changed)
    branches/lua/lib/ivis_common/ivisdef.h
    branches/lua/lib/ivis_common/piedef.h
    branches/lua/lib/ivis_common/piemode.h
    branches/lua/lib/ivis_common/piestate.c
    branches/lua/lib/ivis_common/piestate.h
    branches/lua/lib/ivis_common/rendmode.h
    branches/lua/lib/ivis_common/tex.h
    branches/lua/lib/ivis_opengl/ivis_opengl.vcproj   (contents, props changed)
    branches/lua/lib/ivis_opengl/pieblitfunc.c
    branches/lua/lib/ivis_opengl/piedraw.c
    branches/lua/lib/ivis_opengl/piefunc.c
    branches/lua/lib/ivis_opengl/piemode.c
    branches/lua/lib/ivis_opengl/piepalette.c
    branches/lua/lib/ivis_opengl/piestate.c
    branches/lua/lib/ivis_opengl/rendmode.c
    branches/lua/lib/ivis_opengl/screen.c
    branches/lua/lib/ivis_opengl/tex.c
    branches/lua/lib/ivis_opengl/textdraw.c
    branches/lua/lib/netplay/netlog.c
    branches/lua/lib/netplay/netlog.h
    branches/lua/lib/netplay/netplay.vcproj   (contents, props changed)
    branches/lua/lib/script/chat_lexer.l
    branches/lua/lib/script/chat_parser.y
    branches/lua/lib/script/event.c
    branches/lua/lib/script/event.h
    branches/lua/lib/script/script.vcproj   (contents, props changed)
    branches/lua/lib/script/script_parser.y
    branches/lua/lib/sequence/sequence.vcproj   (contents, props changed)
    branches/lua/lib/sound/audio.c
    branches/lua/lib/sound/playlist.c
    branches/lua/lib/sound/sound.vcproj   (contents, props changed)
    branches/lua/lib/sqlite3/physfs_vfs.c
    branches/lua/lib/sqlite3/sqlite3.vcproj   (contents, props changed)
    branches/lua/lib/widget/bar.c
    branches/lua/lib/widget/bar.h
    branches/lua/lib/widget/button.c
    branches/lua/lib/widget/button.h
    branches/lua/lib/widget/editbox.c
    branches/lua/lib/widget/editbox.h
    branches/lua/lib/widget/form.c
    branches/lua/lib/widget/form.h
    branches/lua/lib/widget/label.c
    branches/lua/lib/widget/label.h
    branches/lua/lib/widget/scrap.c
    branches/lua/lib/widget/slider.c
    branches/lua/lib/widget/slider.h
    branches/lua/lib/widget/widget.c
    branches/lua/lib/widget/widget.h
    branches/lua/lib/widget/widget.vcproj   (contents, props changed)
    branches/lua/pkg/dpkg/   (props changed)
    branches/lua/pkg/nsis/   (props changed)
    branches/lua/po/LINGUAS
    branches/lua/po/da.po
    branches/lua/po/de.po
    branches/lua/po/la.po
    branches/lua/po/nb.po
    branches/lua/po/nl.po
    branches/lua/src/basedef.h
    branches/lua/src/cluster.c
    branches/lua/src/combat.c
    branches/lua/src/combat.h
    branches/lua/src/configuration.c
    branches/lua/src/data.c
    branches/lua/src/display3d.c
    branches/lua/src/display3d.h
    branches/lua/src/display3ddef.h
    branches/lua/src/drive.c
    branches/lua/src/drive.h
    branches/lua/src/droid.c
    branches/lua/src/droid.h
    branches/lua/src/droiddef.h
    branches/lua/src/effects.c
    branches/lua/src/feature.c
    branches/lua/src/feature.h
    branches/lua/src/featuredef.h
    branches/lua/src/fpath.c
    branches/lua/src/frontend.c
    branches/lua/src/function.c
    branches/lua/src/game.c
    branches/lua/src/gateway.c
    branches/lua/src/geometry.c
    branches/lua/src/hci.c
    branches/lua/src/ingameop.c
    branches/lua/src/init.c
    branches/lua/src/intdisplay.c
    branches/lua/src/intimage.c
    branches/lua/src/keybind.c
    branches/lua/src/keybind.h
    branches/lua/src/keymap.c
    branches/lua/src/level_lexer.l
    branches/lua/src/lighting.c
    branches/lua/src/lighting.h
    branches/lua/src/loadsave.c
    branches/lua/src/loop.c
    branches/lua/src/main.c
    branches/lua/src/map.c
    branches/lua/src/map.h
    branches/lua/src/mapdisplay.c
    branches/lua/src/mission.c
    branches/lua/src/move.c
    branches/lua/src/move.h
    branches/lua/src/multigifts.c
    branches/lua/src/multiint.c
    branches/lua/src/multijoin.c
    branches/lua/src/multijoin.h
    branches/lua/src/multilimit.c
    branches/lua/src/multimenu.c
    branches/lua/src/multiopt.c
    branches/lua/src/multistat.c
    branches/lua/src/multisync.c
    branches/lua/src/order.c
    branches/lua/src/radar.c
    branches/lua/src/raycast.c
    branches/lua/src/scores.c
    branches/lua/src/scriptai.c
    branches/lua/src/scriptvals_lexer.l
    branches/lua/src/scriptvals_parser.y
    branches/lua/src/seqdisp.c
    branches/lua/src/stats.c
    branches/lua/src/structure.c
    branches/lua/src/structuredef.h
    branches/lua/src/target.c
    branches/lua/src/target.h
    branches/lua/src/text.h
    branches/lua/src/texture.c
    branches/lua/src/visibility.c
    branches/lua/src/visibility.h
    branches/lua/src/warcam.c
    branches/lua/src/warcam.h
    branches/lua/src/wrappers.c
    branches/lua/tools/conversion/pie2wzm.c
    branches/lua/warzone2100.cbp
    branches/lua/win32/Warzone2100.sln   (contents, props changed)
    branches/lua/win32/Warzone2100.vcproj   (contents, props changed)


_______________________________________________
Warzone-commits mailing list
[email protected]
https://mail.gna.org/listinfo/warzone-commits

Reply via email to