Branch: refs/heads/qt
Home: https://github.com/Warzone2100/warzone2100
Commit: 98f9b3b6012ba9f64437ca6fdc2238edb25471be
https://github.com/Warzone2100/warzone2100/commit/98f9b3b6012ba9f64437ca6fdc2238edb25471be
Author: Buginator bugina...@gna.org
Date: 2011-04-17 (Sun, 17 Apr 2011)
Changed paths:
M pkg/nsis/warzone2100.nsi
Log Message:
---
Add version number to title, and GPL license dialog, and also add a hotlink for
our site.
Russian Dutch strings need to be fixed.
Commit: dda501bf13f2bcc1ed3c770cbf95502b1c42c391
https://github.com/Warzone2100/warzone2100/commit/dda501bf13f2bcc1ed3c770cbf95502b1c42c391
Author: Per Inge Mathisen p...@wz2100.net
Date: 2011-04-17 (Sun, 17 Apr 2011)
Changed paths:
M .gitattributes
M .gitignore
R build_tools/autorevision/autorevision.vcproj
M data/base/sequenceaudio/cam3/c003.txa
M data/base/wrf/cam2/cam2change.wrf
M data/base/wrf/cam3/cam3change.wrf
M data/mods/multiplay/old-1.10-balance/messages/strings/names.txt
M data/mods/multiplay/old-1.10-balance/stats/body.txt
M lib/exceptionhandler/exceptionhandler.cpp
M lib/exceptionhandler/exchndl.cpp
M lib/framework/i18n.cpp
R lib/ivis_opengl/ivis_common.vcproj
M macosx/BuildBot/03_upload.sh
A macosx/Resources/wzlocal/ca_ES.lproj/InfoPlist.strings
A macosx/Resources/wzlocal/hu.lproj/InfoPlist.strings
A macosx/Warzone.xcodeproj/project.xcworkspace/contents.xcworkspacedata
A macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Make DMGs for
Release.xcscheme
A macosx/Warzone.xcodeproj/xcshareddata/xcschemes/Warzone.xcscheme
A macosx/Warzone.xcworkspace/Do not hand edit these files under any
circumstances, always use xcode
A macosx/Warzone.xcworkspace/contents.xcworkspacedata
M macosx/configs/Project-All.xcconfig
M macosx/configs/Warzone-Debug.xcconfig
M macosx/configs/Warzone-Release.xcconfig
M pkg/nsis/warzone2100.nsi
M po/LINGUAS
A po/ca_ES.po
M po/cs.po
M po/da.po
M po/de.po
M po/en_GB.po
M po/es.po
M po/et_EE.po
M po/fi.po
M po/fr.po
M po/fy.po
M po/ga.po
M po/hr.po
A po/hu.po
M po/it.po
M po/ko.po
M po/la.po
M po/lt.po
M po/nb.po
M po/nl.po
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/sk.po
M po/sl.po
M po/tr.po
M po/uk_UA.po
M po/zh_CN.po
M po/zh_TW.po
M src/display.cpp
M src/game.cpp
M src/hci.cpp
M src/init.cpp
M src/keybind.cpp
M src/levels.cpp
M src/main.cpp
M src/main.h
M src/mission.cpp
M src/modding.h
M src/radar.cpp
M src/radar.h
M src/texture.cpp
R tools/lobby/COPYING
R tools/lobby/WzMasterServer.py
R tools/masterserver/COPYING
R tools/masterserver/game.py
R tools/masterserver/ircbot.py
R tools/masterserver/motd.txt
R tools/masterserver/motd2.2.txt
R tools/masterserver/protocol.py
R tools/masterserver/wzmasterserver.py
R tools/masterserver/wztest.py
Log Message:
---
Merge remote branch 'origin/master' into qt
Conflicts:
data/base/script/text/cam1a.slo
lib/exceptionhandler/exceptionhandler.vcxproj
lib/exceptionhandler/exchndl.h
lib/framework/framework.vcxproj
lib/gamelib/gamelib.vcxproj
lib/iniparser/iniparser.vcxproj
lib/ivis_opengl/ivis_common.vcproj
lib/ivis_opengl/ivis_opengl.vcxproj
lib/netplay/netplay.vcxproj
lib/script/script.vcxproj
lib/sequence/sequence.vcxproj
lib/sound/sound.vcxproj
lib/widget/widget.vcxproj
macosx/README.BUILD.txt
macosx/Warzone.xcodeproj/project.pbxproj
src/Warzone2100.vcxproj
src/main.cpp
Compare: https://github.com/Warzone2100/warzone2100/compare/68b940d...dda501b
--
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
