mirror of
https://gitlab.com/xonotic/xonotic
synced 2025-02-02 11:41:45 +00:00
Merge branch 'master' into divVerent/crypto2
Conflicts: all
This commit is contained in:
commit
cb2a4b93c1
6
all
6
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
|
||||
|
@ -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>
|
||||
|
@ -14,5 +14,7 @@
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1.0</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>10.4.0</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
Loading…
Reference in New Issue
Block a user