Revision: 11048
http://warzone2100.svn.sourceforge.net/warzone2100/?rev=11048&view=rev
Author: cypr
Date: 2010-06-26 20:45:32 +0000 (Sat, 26 Jun 2010)
Log Message:
-----------
Merge remote branch 'origin/master' into newnet
Conflicts:
lib/gamelib/gtime.c
lib/netplay/netplay.c
macosx/Warzone.xcodeproj/project.pbxproj
src/multiint.c
src/multisync.c
From: Cyp <[email protected]>
Modified Paths:
--------------
branches/newnet/lib/framework/debug.c
branches/newnet/lib/framework/frame.h
branches/newnet/lib/framework/wzglobal.h
branches/newnet/lib/gamelib/gtime.c
branches/newnet/lib/gamelib/gtime.h
branches/newnet/lib/ivis_opengl/pieblitfunc.c
branches/newnet/lib/netplay/netplay.c
branches/newnet/lib/sequence/sequence.c
branches/newnet/macosx/README.txt
branches/newnet/macosx/configs/Gettext-All.xcconfig
branches/newnet/macosx/configs/Project-All.xcconfig
branches/newnet/macosx/configs/QuesoGLC-All.xcconfig
branches/newnet/macosx/configs/QuesoGLC-Debug.xcconfig
branches/newnet/macosx/configs/QuesoGLC-Release.xcconfig
branches/newnet/macosx/configs/Theora-All.xcconfig
branches/newnet/macosx/configs/Vorbis-All.xcconfig
branches/newnet/macosx/configs/Warzone-All.xcconfig
branches/newnet/macosx/configs/Zlib-All.xcconfig
branches/newnet/src/advvis.c
branches/newnet/src/advvis.h
branches/newnet/src/configuration.c
branches/newnet/src/drive.c
branches/newnet/src/feature.c
branches/newnet/src/frontend.c
branches/newnet/src/frontend.h
branches/newnet/src/game.c
branches/newnet/src/intdisplay.c
branches/newnet/src/keybind.c
branches/newnet/src/keyedit.c
branches/newnet/src/main.c
branches/newnet/src/move.c
branches/newnet/src/move.h
branches/newnet/src/movedef.h
branches/newnet/src/multiint.c
branches/newnet/src/multiint.h
branches/newnet/src/multijoin.c
branches/newnet/src/multimenu.c
branches/newnet/src/multiopt.c
branches/newnet/src/multistat.c
branches/newnet/src/multistat.h
branches/newnet/src/multisync.c
branches/newnet/src/radar.c
branches/newnet/src/wavecast.cpp
branches/newnet/src/wrappers.c
branches/newnet/win32/Makefile.am
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
