Merge branch 'master' into divVerent/crypto2

Conflicts:
	all
This commit is contained in:
Rudolf Polzer 2010-09-03 09:08:18 +02:00
commit cb2a4b93c1
3 changed files with 14 additions and 1 deletions

6
all
View File

@ -945,7 +945,11 @@ case "$cmd" in
esac
verbose rm -rf Xonotic Xonotic*.zip
verbose mkdir -p Xonotic
verbose date +%Y%m%d > Xonotic/stamp.txt
if [ -n "$RELEASEDATE" ]; then
verbose echo "$RELEASEDATE" > Xonotic/stamp.txt
else
verbose date +%Y%m%d > Xonotic/stamp.txt
fi
verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles key_0.d0pk | {
verbose cd Xonotic
verbose mkdir data fteqcc source source/darkplaces source/fteqcc

View File

@ -14,5 +14,12 @@
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>LSMinimumSystemVersion</key>
<string>10.4.0</string>
<key>LSMinimumSystemVersionByArchitecture</key>
<dict>
<key>x86_64</key>
<string>10.6.0</string>
</dict>
</dict>
</plist>

View File

@ -14,5 +14,7 @@
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>LSMinimumSystemVersion</key>
<string>10.4.0</string>
</dict>
</plist>