Merge branch 'master' into divVerent/crypto2

Conflicts:
	all

diff --git a/all b/all
index fc3b969be73a3e988ee46015cc34b020d937dfeb..bd561dde72a4ca59ef025b5719363aed50f15d00 100755 (executable)
--- a/all
+++ b/all
@@ -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

diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Info.plist b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Info.plist
index 7b2f6b2147a215f286cad719a12acd615db4eab0..4657eb90a61ccd1e0eb37ea9ea489064b7ded38a 100644 (file)
--- a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Info.plist
+++ b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Info.plist
@@ -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>

diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/Info.plist b/misc/buildfiles/osx/Xonotic.app/Contents/Info.plist
index a6a0eb53f506c66b688c4bba0d6237da0cb5b76d..316a314be16414af799c0a3c830a00180c8574d6 100644 (file)
--- a/misc/buildfiles/osx/Xonotic.app/Contents/Info.plist
+++ b/misc/buildfiles/osx/Xonotic.app/Contents/Info.plist
@@ -14,5 +14,7 @@
        <string>????</string>
        <key>CFBundleVersion</key>
        <string>1.0</string>
+       <key>LSMinimumSystemVersion</key>
+       <string>10.4.0</string>
 </dict>
 </plist>