Commit Graph

4 Commits (76650418ade70825fdc3b683cefc48ecafc76585)

Author SHA1 Message Date
Cyp 60d7cb6127 Merge remote branch 'origin/master' into qt
Conflicts:
	.hgignore (manual merge)
	lib/framework/wzapp_c.h (used qt)
	macosx/Warzone.xcodeproj/project.pbxproj (used qt)
	po/*.po (used master)
2010-11-21 21:46:08 +01:00
dak180 654819950b Update the dmg script to allow for code signing. 2010-11-14 20:13:59 -05:00
dak180 15db57f405 Update the ignores. 2010-10-05 23:42:50 -04:00
Buginator 25b94eac78 add filter for hg
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10836 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:48 +02:00