Revision: 10062
          http://warzone2100.svn.sourceforge.net/warzone2100/?rev=10062&view=rev
Author:   i-nod
Date:     2010-02-28 21:43:16 +0000 (Sun, 28 Feb 2010)

Log Message:
-----------
shaders: Merge 10010-10060 from trunk.

Modified Paths:
--------------
    branches/shaders/Makefile.am
    branches/shaders/configure.ac
    branches/shaders/data/mods/multiplay/makefile.win32
    branches/shaders/data/mods/multiplay/ntw/stats/assignweapons.txt
    branches/shaders/data/mods/multiplay/ntw/stats/templates.txt
    branches/shaders/lib/framework/vector.h
    branches/shaders/lib/ivis_opengl/Makefile.am
    branches/shaders/lib/ivis_opengl/ivis_opengl.vcproj
    branches/shaders/lib/ivis_opengl/makefile.win32
    branches/shaders/lib/ivis_opengl/pieblitfunc.c
    branches/shaders/lib/ivis_opengl/piedraw.c
    branches/shaders/lib/ivis_opengl/piefunc.c
    branches/shaders/lib/ivis_opengl/piematrix.c
    branches/shaders/lib/ivis_opengl/piemode.c
    branches/shaders/lib/ivis_opengl/piestate.c
    branches/shaders/lib/ivis_opengl/screen.c
    branches/shaders/lib/ivis_opengl/tex.c
    branches/shaders/lib/ivis_opengl/textdraw.c
    branches/shaders/lib/netplay/nettypes.c
    branches/shaders/lib/netplay/nettypes.h
    branches/shaders/lib/sequence/Makefile.am
    branches/shaders/lib/sequence/makefile.win32
    branches/shaders/lib/sequence/sequence.c
    branches/shaders/lib/sequence/sequence.vcproj
    branches/shaders/macosx/Resources/Warzone-Info.plist
    branches/shaders/macosx/Resources/wzlocal/English.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/cs.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/da.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/de.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/en_GB.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/es.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/et_EE.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/fi.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/fr.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/fy.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/ga.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/hr.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/it.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/la.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/lt.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/nb.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/nl.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/pl.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/pt.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/pt_BR.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/ro.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/ru.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/sl.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/uk_UA.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/zh_CN.lproj/InfoPlist.strings
    branches/shaders/macosx/Resources/wzlocal/zh_TW.lproj/InfoPlist.strings
    branches/shaders/macosx/Warzone.xcodeproj/project.pbxproj
    branches/shaders/pkg/nsis/warzone2100.nsi
    branches/shaders/src/Makefile.am
    branches/shaders/src/astar.c
    branches/shaders/src/basedef.h
    branches/shaders/src/baseobject.c
    branches/shaders/src/baseobject.h
    branches/shaders/src/display.h
    branches/shaders/src/display3d.c
    branches/shaders/src/droid.c
    branches/shaders/src/droid.h
    branches/shaders/src/frontend.c
    branches/shaders/src/keybind.c
    branches/shaders/src/makefile.win32
    branches/shaders/src/move.c
    branches/shaders/src/multibot.c
    branches/shaders/src/multigifts.c
    branches/shaders/src/multiint.c
    branches/shaders/src/multilimit.c
    branches/shaders/src/multimenu.c
    branches/shaders/src/multiplay.c
    branches/shaders/src/multistruct.c
    branches/shaders/src/multisync.c
    branches/shaders/src/order.c
    branches/shaders/src/projectile.c
    branches/shaders/src/scriptfuncs.c
    branches/shaders/src/structure.c
    branches/shaders/src/texture.c
    branches/shaders/src/visibility.c
    branches/shaders/src/wrappers.c
    branches/shaders/win32/Warzone2100.vs2k8.vcproj

Added Paths:
-----------
    branches/shaders/macosx/configs/FetchPrebuilt.sh
    branches/shaders/macosx/configs/FetchSource.sh
    branches/shaders/macosx/configs/bison.sh

Removed Paths:
-------------
    branches/shaders/macosx/external/bison.sh

Property Changed:
----------------
    branches/shaders/
    branches/shaders/data/base/anims/
    branches/shaders/data/base/audio/
    branches/shaders/data/base/components/
    branches/shaders/data/base/effects/
    branches/shaders/data/base/features/
    branches/shaders/data/base/gamedesc.lev
    branches/shaders/data/base/images/
    branches/shaders/data/base/locale/
    branches/shaders/data/base/messages/
    branches/shaders/data/base/misc/
    branches/shaders/data/base/multiplay/
    branches/shaders/data/base/novideo.rpl
    branches/shaders/data/base/script/
    branches/shaders/data/base/sequenceaudio/
    branches/shaders/data/base/stats/
    branches/shaders/data/base/structs/
    branches/shaders/data/base/tagdefinitions/
    branches/shaders/data/base/texpages/
    branches/shaders/data/base/wrf/
    branches/shaders/data/mods/multiplay/Makefile.am
    branches/shaders/data/mods/multiplay/makefile.win32
    branches/shaders/data/mods/multiplay/ntw/
    branches/shaders/data/mp/messages/resmessagesall.rmsg
    branches/shaders/data/music/
    branches/shaders/lib/betawidget/autogen.sh
    branches/shaders/lib/betawidget/m4/ax_compare_version.m4
    branches/shaders/lib/betawidget/m4/ax_with_prog.m4
    branches/shaders/lib/betawidget/src/betawidget.i
    branches/shaders/lib/betawidget/src/clipboard.h
    branches/shaders/lib/betawidget/src/font.c
    branches/shaders/lib/betawidget/src/font.h
    branches/shaders/lib/betawidget/src/geom.c
    branches/shaders/lib/betawidget/src/geom.h
    branches/shaders/lib/betawidget/src/hBox.c
    branches/shaders/lib/betawidget/src/hBox.h
    branches/shaders/lib/betawidget/src/internal-cairo.h
    branches/shaders/lib/betawidget/src/keycode.h
    branches/shaders/lib/betawidget/src/lua-wrap.h
    branches/shaders/lib/betawidget/src/lua_memberfnptr.i
    branches/shaders/lib/betawidget/src/lua_table_as_array.i
    branches/shaders/lib/betawidget/src/platform/
    branches/shaders/lib/betawidget/src/spacer.c
    branches/shaders/lib/betawidget/src/spacer.h
    branches/shaders/lib/betawidget/src/table.c
    branches/shaders/lib/betawidget/src/table.h
    branches/shaders/lib/betawidget/src/textEntry.c
    branches/shaders/lib/betawidget/src/textEntry.h
    branches/shaders/lib/betawidget/src/vector.c
    branches/shaders/lib/betawidget/src/vector.h
    branches/shaders/lib/betawidget/src/widget.c
    branches/shaders/lib/betawidget/src/widget.h
    branches/shaders/lib/betawidget/src/window.c
    branches/shaders/lib/betawidget/src/window.h
    branches/shaders/lib/betawidget/tools/Makefile.am
    branches/shaders/lib/framework/fixedpoint.h
    branches/shaders/lib/framework/utf.c
    branches/shaders/lib/framework/utf.h
    branches/shaders/pkg/rpm/warzone2100.spec
    branches/shaders/src/baseobject.c
    branches/shaders/src/baseobject.h
    branches/shaders/src/message_lexer.l
    branches/shaders/tools/editworld/doc/todo.txt
    branches/shaders/tools/map/map2lnd.c
    branches/shaders/tools/map/mapconv.c
    branches/shaders/tools/map/mapinfo.c


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

Reply via email to