Revision: 11176 http://warzone2100.svn.sourceforge.net/warzone2100/?rev=11176&view=rev Author: cypr Date: 2010-07-12 06:09:54 +0000 (Mon, 12 Jul 2010)
Log Message: ----------- Merge remote branch 'origin/master' into newnet Conflicts: lib/gamelib/gtime.h From: Cyp <c...@example.com> Modified Paths: -------------- branches/newnet/.gitignore branches/newnet/data/base/multiplay/maps/2c-startup/dinit.bjo branches/newnet/data/base/multiplay/maps/2c-startup/feat.bjo branches/newnet/data/base/multiplay/maps/2c-startup/game.map branches/newnet/data/base/multiplay/maps/2c-startup/struct.bjo branches/newnet/data/base/multiplay/maps/8c-wheeloffortune/dinit.bjo branches/newnet/data/base/multiplay/maps/8c-wheeloffortune/feat.bjo branches/newnet/data/base/multiplay/maps/8c-wheeloffortune/game.map branches/newnet/data/base/multiplay/maps/8c-wheeloffortune/struct.bjo branches/newnet/lib/framework/i18n.c branches/newnet/lib/framework/trig.c branches/newnet/lib/sound/openal_track.c branches/newnet/lib/sound/track.h branches/newnet/po/cs.po branches/newnet/po/da.po branches/newnet/po/de.po branches/newnet/po/en_GB.po branches/newnet/po/es.po branches/newnet/po/et_EE.po branches/newnet/po/fi.po branches/newnet/po/fr.po branches/newnet/po/fy.po branches/newnet/po/ga.po branches/newnet/po/hr.po branches/newnet/po/it.po branches/newnet/po/la.po branches/newnet/po/lt.po branches/newnet/po/nb.po branches/newnet/po/nl.po branches/newnet/po/pl.po branches/newnet/po/pt.po branches/newnet/po/pt_BR.po branches/newnet/po/ro.po branches/newnet/po/ru.po branches/newnet/po/sl.po branches/newnet/po/uk_UA.po branches/newnet/po/zh_CN.po branches/newnet/po/zh_TW.po branches/newnet/src/astar.cpp branches/newnet/src/init.c branches/newnet/src/intelmap.c branches/newnet/src/main.c branches/newnet/src/move.c branches/newnet/src/move.h branches/newnet/src/multimenu.c branches/newnet/src/order.c branches/newnet/src/pointtree.cpp branches/newnet/tools/conversion/simplipie.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 Warzone2100-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-commits