Revision: 10148
http://warzone2100.svn.sourceforge.net/warzone2100/?rev=10148&view=rev
Author: cypr
Date: 2010-03-04 19:50:57 +0000 (Thu, 04 Mar 2010)
Log Message:
-----------
Merge remote branches 'origin/qt' and 'origin/master' into qt
Conflicts:
macosx/Warzone.xcodeproj/project.pbxproj
From: Cyp <[email protected]>
Modified Paths:
--------------
branches/qt/data/mods/multiplay/makefile.win32
branches/qt/lib/netplay/netplay.c
branches/qt/macosx/Resources/Warzone-Info.plist
branches/qt/macosx/Resources/wzlocal/English.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/cs.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/da.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/de.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/en_GB.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/es.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/et_EE.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/fi.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/fr.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/fy.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/ga.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/hr.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/it.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/la.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/lt.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/nb.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/nl.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/pl.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/pt.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/pt_BR.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/ro.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/ru.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/sl.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/uk_UA.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/zh_CN.lproj/InfoPlist.strings
branches/qt/macosx/Resources/wzlocal/zh_TW.lproj/InfoPlist.strings
branches/qt/pkg/nsis/warzone2100.nsi
branches/qt/src/astar.c
branches/qt/src/display.h
branches/qt/src/keybind.c
Added Paths:
-----------
branches/qt/win32/libs/sdl/patches/001-iconv-preprocessor-fix.diff
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Warzone2100-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
