Revision: 11355
http://warzone2100.svn.sourceforge.net/warzone2100/?rev=11355&view=rev
Author: cypr
Date: 2010-08-01 19:16:27 +0000 (Sun, 01 Aug 2010)
Log Message:
-----------
Merge branch 'master' into newnet
Conflicts:
lib/netplay/netplay.c
src/multiint.c
From: Cyp <c...@example.com>
Modified Paths:
--------------
branches/newnet/lib/netplay/netplay.c
branches/newnet/lib/netplay/netplay.h
branches/newnet/src/multiint.c
branches/newnet/src/multiplay.c
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://p.sf.net/sfu/dev2dev-palm
_______________________________________________
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
