Revision: 10221
http://warzone2100.svn.sourceforge.net/warzone2100/?rev=10221&view=rev
Author: cypr
Date: 2010-03-10 22:04:40 +0000 (Wed, 10 Mar 2010)
Log Message:
-----------
Merge remote branch 'origin/master' into newnet
Conflicts:
lib/framework/trig.c
lib/netplay/netplay.c
src/pointtree.h
From: Cyp <[email protected]>
Modified Paths:
--------------
branches/newnet/data/base/shaders/tcmask.frag
branches/newnet/data/base/shaders/tcmask.vert
branches/newnet/data/base/stats/weapons.txt
branches/newnet/lib/framework/SDL_framerate.h
branches/newnet/lib/framework/cursors.h
branches/newnet/lib/framework/input.c
branches/newnet/lib/framework/input.h
branches/newnet/lib/framework/listmacs.h
branches/newnet/lib/framework/trig.c
branches/newnet/lib/framework/types.h
branches/newnet/lib/framework/wzglobal.h
branches/newnet/lib/ivis_common/piedef.h
branches/newnet/lib/ivis_common/piestate.h
branches/newnet/lib/ivis_common/tex.h
branches/newnet/lib/ivis_opengl/pieblitfunc.c
branches/newnet/lib/ivis_opengl/piedraw.c
branches/newnet/lib/ivis_opengl/piefunc.c
branches/newnet/lib/ivis_opengl/piestate.c
branches/newnet/lib/netplay/netplay.c
branches/newnet/lib/script/chat_lexer.l
branches/newnet/lib/script/codeprint.h
branches/newnet/lib/script/script_lexer.l
branches/newnet/lib/script/script_parser.y
branches/newnet/lib/widget/form.h
branches/newnet/lib/widget/tip.h
branches/newnet/src/atmos.c
branches/newnet/src/bridge.h
branches/newnet/src/data.h
branches/newnet/src/design.h
branches/newnet/src/display.c
branches/newnet/src/display.h
branches/newnet/src/display3d.c
branches/newnet/src/intelmap.h
branches/newnet/src/keybind.c
branches/newnet/src/keyedit.c
branches/newnet/src/multimenu.h
branches/newnet/src/projectile.h
branches/newnet/src/scriptobj.h
branches/newnet/src/scripttabs.h
branches/newnet/src/scriptvals.h
branches/newnet/src/terrain.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
