Revision: 11213
http://warzone2100.svn.sourceforge.net/warzone2100/?rev=11213&view=rev
Author: cypr
Date: 2010-07-16 19:53:06 +0000 (Fri, 16 Jul 2010)
Log Message:
-----------
Merge remote branch 'origin/master' into newnet
Conflicts:
configure.ac
From: Cyp <[email protected]>
Modified Paths:
--------------
branches/newnet/configure.ac
branches/newnet/lib/framework/input.c
branches/newnet/lib/widget/editbox.c
branches/newnet/src/configuration.c
branches/newnet/src/console.c
branches/newnet/src/display.c
branches/newnet/src/display.h
branches/newnet/src/frontend.c
branches/newnet/src/frontend.h
branches/newnet/src/intdisplay.c
branches/newnet/src/levels.c
branches/newnet/src/move.c
branches/newnet/src/multiint.c
branches/newnet/src/multiopt.c
branches/newnet/src/terrain.c
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
