Revision: 11239
http://warzone2100.svn.sourceforge.net/warzone2100/?rev=11239&view=rev
Author: cypr
Date: 2010-07-20 21:15:22 +0000 (Tue, 20 Jul 2010)
Log Message:
-----------
Merge remote branch 'origin/master' into newnet
Conflicts:
macosx/Warzone.xcodeproj/project.pbxproj
From: Cyp <c...@example.com>
Modified Paths:
--------------
branches/newnet/lib/ivis_opengl/textdraw.c
branches/newnet/macosx/Resources/Warzone-Info.plist
branches/newnet/src/configuration.c
branches/newnet/src/intdisplay.c
branches/newnet/src/move.c
Added Paths:
-----------
branches/newnet/macosx/Warzone.xcodeproj/Do not hand edit these files under
any circumstances, always use xcode
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
