Author: muggenhor
Date: Wed Nov 26 21:07:04 2008
New Revision: 6392
URL: http://svn.gna.org/viewcvs/warzone?rev=6392&view=rev
Log:
Merge r6305:6391 from trunk into the lua2 branch
Added:
branches/lua2/build_tools/code-generators/sql_insertdef_cg.pm
- copied unchanged from r6391,
trunk/build_tools/code-generators/sql_insertdef_cg.pm
branches/lua2/data/base/Makefile.am
- copied unchanged from r6391, trunk/data/base/Makefile.am
branches/lua2/data/base/stats-sql/Makefile.am
- copied unchanged from r6391, trunk/data/base/stats-sql/Makefile.am
branches/lua2/data/base/stats-sql/stats-db2.data.sql
- copied unchanged from r6391,
trunk/data/base/stats-sql/stats-db2.data.sql
branches/lua2/data/base/stats-sql/stats-db2.schema.sql
- copied unchanged from r6391,
trunk/data/base/stats-sql/stats-db2.schema.sql
branches/lua2/data/base/texpages/page-25-sky-arizona.png
- copied unchanged from r6391,
trunk/data/base/texpages/page-25-sky-arizona.png
branches/lua2/data/base/texpages/page-25-sky-urban.png
- copied unchanged from r6391,
trunk/data/base/texpages/page-25-sky-urban.png
branches/lua2/lib/betawidget/Makefile.am
- copied unchanged from r6391, trunk/lib/betawidget/Makefile.am
branches/lua2/lib/betawidget/src/ (props changed)
- copied from r6391, trunk/lib/betawidget/src/
branches/lua2/lib/betawidget/tools/Makefile.am
- copied unchanged from r6391, trunk/lib/betawidget/tools/Makefile.am
branches/lua2/m4/ax_compare_version.m4
- copied unchanged from r6391, trunk/m4/ax_compare_version.m4
branches/lua2/m4/ax_prog_perl_version.m4
- copied unchanged from r6391, trunk/m4/ax_prog_perl_version.m4
branches/lua2/m4/ax_with_perl.m4
- copied unchanged from r6391, trunk/m4/ax_with_perl.m4
branches/lua2/m4/ax_with_prog.m4
- copied unchanged from r6391, trunk/m4/ax_with_prog.m4
branches/lua2/src/stats-db2.c
- copied unchanged from r6391, trunk/src/stats-db2.c
branches/lua2/src/stats-db2.tpl.sql.c
- copied unchanged from r6391, trunk/src/stats-db2.tpl.sql.c
Removed:
branches/lua2/data/base/stats-sql/data/construction.sql
branches/lua2/data/base/stats-sql/data/propulsion.sql
branches/lua2/data/base/stats-sql/data/sensor.sql
branches/lua2/data/base/stats-sql/schema/construction.sql
branches/lua2/data/base/stats-sql/schema/propulsion.sql
branches/lua2/data/base/stats-sql/schema/sensor.sql
branches/lua2/data/base/texpages/page-25-sky.png
branches/lua2/lib/betawidget/betawidget.i
branches/lua2/lib/betawidget/clipboard.h
branches/lua2/lib/betawidget/font.c
branches/lua2/lib/betawidget/font.h
branches/lua2/lib/betawidget/geom.c
branches/lua2/lib/betawidget/geom.h
branches/lua2/lib/betawidget/hBox.c
branches/lua2/lib/betawidget/hBox.h
branches/lua2/lib/betawidget/internal-cairo.h
branches/lua2/lib/betawidget/keycode.h
branches/lua2/lib/betawidget/lua-wrap.h
branches/lua2/lib/betawidget/platform/
branches/lua2/lib/betawidget/spacer.c
branches/lua2/lib/betawidget/spacer.h
branches/lua2/lib/betawidget/table.c
branches/lua2/lib/betawidget/table.h
branches/lua2/lib/betawidget/textEntry.c
branches/lua2/lib/betawidget/textEntry.h
branches/lua2/lib/betawidget/vector.c
branches/lua2/lib/betawidget/vector.h
branches/lua2/lib/betawidget/widget.c
branches/lua2/lib/betawidget/widget.h
branches/lua2/lib/betawidget/window.c
branches/lua2/lib/betawidget/window.h
Modified:
branches/lua2/COPYING.NONGPL
branches/lua2/Doxyfile
branches/lua2/build_tools/code-generators/Makefile
branches/lua2/build_tools/code-generators/c_sqliteload_cg.pm
branches/lua2/build_tools/code-generators/c_structdef_cg.pm
branches/lua2/build_tools/code-generators/db-lang.pl
branches/lua2/build_tools/code-generators/sql_tabledef_cg.pm
branches/lua2/configure.ac
branches/lua2/data/Makefile.am
branches/lua2/data/base/ (props changed)
branches/lua2/data/base/multiplay/skirmish/player0.slo
branches/lua2/data/base/multiplay/skirmish/player1.slo
branches/lua2/data/base/multiplay/skirmish/player2.slo
branches/lua2/data/base/multiplay/skirmish/player3.slo
branches/lua2/data/base/multiplay/skirmish/player4.slo
branches/lua2/data/base/multiplay/skirmish/player5.slo
branches/lua2/data/base/multiplay/skirmish/player6.slo
branches/lua2/data/base/multiplay/skirmish/player7.slo
branches/lua2/data/base/stats-sql/ (props changed)
branches/lua2/data/base/stats-sql/stats.db
branches/lua2/data/base/wrf/stats.wrf
branches/lua2/data/base/wrf/vidmem.wrf
branches/lua2/data/base/wrf/vidmem2.wrf
branches/lua2/data/base/wrf/vidmem3.wrf
branches/lua2/data/makefile.win32
branches/lua2/data/mods/global/grim/wrf/vidmem.wrf
branches/lua2/data/mods/global/grim/wrf/vidmem2.wrf
branches/lua2/data/mods/global/grim/wrf/vidmem3.wrf
branches/lua2/data/mods/multiplay/ntw/wrf/vidmem.wrf
branches/lua2/data/mods/multiplay/ntw/wrf/vidmem2.wrf
branches/lua2/data/mods/multiplay/ntw/wrf/vidmem3.wrf
branches/lua2/data/mp/wrf/vidmem.wrf
branches/lua2/data/mp/wrf/vidmem2.wrf
branches/lua2/data/mp/wrf/vidmem3.wrf
branches/lua2/lib/betawidget/ (props changed)
branches/lua2/lib/betawidget/autogen.sh
branches/lua2/lib/betawidget/configure.ac
branches/lua2/lib/betawidget/src/platform/ (props changed)
branches/lua2/lib/betawidget/src/platform/sdl/ (props changed)
branches/lua2/lib/betawidget/tools/ (props changed)
branches/lua2/lib/betawidget/tools/sdl-testapp.c
branches/lua2/lib/exceptionhandler/exceptionhandler.vcproj
branches/lua2/lib/framework/wzglobal.h
branches/lua2/po/POTFILES.in
branches/lua2/src/Makefile.am
branches/lua2/src/action.c
branches/lua2/src/action.h
branches/lua2/src/bridge.c
branches/lua2/src/component.c
branches/lua2/src/data.c
branches/lua2/src/display3d.c
branches/lua2/src/keybind.c
branches/lua2/src/loop.c
branches/lua2/src/mapdisplay.h
branches/lua2/src/move.c
branches/lua2/src/projectile.c
branches/lua2/src/radar.c
branches/lua2/src/stats-db.c
branches/lua2/src/stats-db.h
branches/lua2/src/stats-db2.h
branches/lua2/src/stats-db2.tpl
branches/lua2/src/stats.c
branches/lua2/src/structuredef.h
branches/lua2/src/visibility.c
_______________________________________________
Warzone-commits mailing list
[email protected]
https://mail.gna.org/listinfo/warzone-commits
