Revision: 10207 http://warzone2100.svn.sourceforge.net/warzone2100/?rev=10207&view=rev Author: cypr Date: 2010-03-09 19:00:30 +0000 (Tue, 09 Mar 2010)
Log Message: ----------- Merge branch 'master' into newnet Conflicts: src/structure.c From: Cyp <c...@example.com> Modified Paths: -------------- branches/newnet/macosx/Warzone.xcodeproj/project.pbxproj branches/newnet/macosx/configs/Gettext-Debug.xcconfig branches/newnet/macosx/configs/Gettext-Release.xcconfig branches/newnet/macosx/configs/Ogg-Debug.xcconfig branches/newnet/macosx/configs/Ogg-Release.xcconfig branches/newnet/macosx/configs/PhysFS-Debug.xcconfig branches/newnet/macosx/configs/PhysFS-Release.xcconfig branches/newnet/macosx/configs/Png-Debug.xcconfig branches/newnet/macosx/configs/Png-Release.xcconfig branches/newnet/macosx/configs/Project-All.xcconfig branches/newnet/macosx/configs/QuesoGLC-Debug.xcconfig branches/newnet/macosx/configs/QuesoGLC-Release.xcconfig branches/newnet/macosx/configs/SDLmain-Debug.xcconfig branches/newnet/macosx/configs/SDLmain-Release.xcconfig branches/newnet/macosx/configs/Theora-Debug.xcconfig branches/newnet/macosx/configs/Theora-Release.xcconfig branches/newnet/macosx/configs/Vorbis-Debug.xcconfig branches/newnet/macosx/configs/Vorbis-Release.xcconfig branches/newnet/macosx/configs/Warzone-All.xcconfig branches/newnet/macosx/configs/Warzone-Debug.xcconfig branches/newnet/macosx/configs/Warzone-Release.xcconfig branches/newnet/macosx/configs/Zlib-Debug.xcconfig branches/newnet/macosx/configs/Zlib-Release.xcconfig branches/newnet/src/action.c branches/newnet/src/display.c branches/newnet/src/fpath.c branches/newnet/src/move.c branches/newnet/src/raycast.c branches/newnet/src/raycast.h branches/newnet/src/structure.c branches/newnet/src/visibility.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 Warzone2100-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-commits