Revision: 11354
http://warzone2100.svn.sourceforge.net/warzone2100/?rev=11354&view=rev
Author: cypr
Date: 2010-08-01 19:15:39 +0000 (Sun, 01 Aug 2010)
Log Message:
-----------
Merge remote branch 'origin/master' into newnet
Conflicts:
lib/framework/wzapp_c.h
src/power.c
src/power.h
From: Cyp <[email protected]>
Modified Paths:
--------------
branches/newnet/lib/framework/fixedpoint.h
branches/newnet/lib/framework/types.h
branches/newnet/lib/netplay/nettypes.cpp
branches/newnet/lib/netplay/nettypes.h
branches/newnet/po/pl.po
branches/newnet/src/droid.c
branches/newnet/src/mission.c
branches/newnet/src/missiondef.h
branches/newnet/src/multisync.c
branches/newnet/src/power.c
branches/newnet/src/power.h
branches/newnet/src/structure.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
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
