Revision: 10189
          http://warzone2100.svn.sourceforge.net/warzone2100/?rev=10189&view=rev
Author:   cypr
Date:     2010-03-07 10:08:30 +0000 (Sun, 07 Mar 2010)

Log Message:
-----------
Merge remote branch 'origin/master' into newnet

From: Cyp <[email protected]>

Modified Paths:
--------------
    branches/newnet/configure.ac
    branches/newnet/data/Makefile.am
    branches/newnet/data/base/palette.txt
    branches/newnet/data/makefile.win32
    branches/newnet/lib/ivis_common/bitimage.c
    branches/newnet/lib/ivis_common/imd.h
    branches/newnet/lib/ivis_common/imdload.c
    branches/newnet/lib/ivis_common/ivisdef.h
    branches/newnet/lib/ivis_common/piedef.h
    branches/newnet/lib/ivis_common/piepalette.h
    branches/newnet/lib/ivis_common/piestate.h
    branches/newnet/lib/ivis_common/tex.h
    branches/newnet/lib/ivis_opengl/piedraw.c
    branches/newnet/lib/ivis_opengl/piepalette.c
    branches/newnet/lib/ivis_opengl/piestate.c
    branches/newnet/lib/ivis_opengl/screen.c
    branches/newnet/lib/ivis_opengl/tex.c
    branches/newnet/macosx/Warzone.xcodeproj/project.pbxproj
    branches/newnet/macosx/configs/Warzone-All.xcconfig
    branches/newnet/src/Makefile.am
    branches/newnet/src/clparse.c
    branches/newnet/src/data.c
    branches/newnet/src/display3d.c
    branches/newnet/src/hci.c
    branches/newnet/src/keyedit.c
    branches/newnet/src/keyedit.h
    branches/newnet/src/main.h
    branches/newnet/src/multiint.h

Added Paths:
-----------
    branches/newnet/data/base/shaders/
    branches/newnet/data/base/shaders/tcmask.frag
    branches/newnet/data/base/shaders/tcmask.vert


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Download Intel&#174; 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