diff options
author | jmarshallnz <jcmarsha@gmail.com> | 2014-05-11 11:02:58 +1200 |
---|---|---|
committer | jmarshallnz <jcmarsha@gmail.com> | 2014-05-11 11:02:58 +1200 |
commit | 6707baf16f6dd9e85508544c751576d8d194507d (patch) | |
tree | 550d05156126ebfa0dab3d0391b30c493950f582 | |
parent | 5e7f451e11a9ab3cdbe92c7be485ce2fbd7db536 (diff) | |
parent | b4caa0470ae27bc05c0efaaf6be913687fafbbf4 (diff) |
Merge pull request #4680 from MartijnKaijser/13.1_b1
13.1 b1
-rw-r--r-- | media/Splash.png | bin | 125484 -> 160537 bytes | |||
-rw-r--r-- | tools/android/packaging/xbmc/AndroidManifest.xml | 4 | ||||
-rwxr-xr-x | tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh | 4 | ||||
-rwxr-xr-x | tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh | 4 | ||||
-rwxr-xr-x | tools/darwin/packaging/xbmc-osx/mkdmg-xbmc-osx.sh | 4 | ||||
-rw-r--r-- | xbmc/GUIInfoManager.h | 4 | ||||
-rw-r--r-- | xbmc/osx/Info.plist | 4 | ||||
-rw-r--r-- | xbmc/win32/XBMC_PC.rc | 4 |
8 files changed, 14 insertions, 14 deletions
diff --git a/media/Splash.png b/media/Splash.png Binary files differindex 6c2b55ed48..454038e07b 100644 --- a/media/Splash.png +++ b/media/Splash.png diff --git a/tools/android/packaging/xbmc/AndroidManifest.xml b/tools/android/packaging/xbmc/AndroidManifest.xml index acf54e0a0a..445b1cd7a2 100644 --- a/tools/android/packaging/xbmc/AndroidManifest.xml +++ b/tools/android/packaging/xbmc/AndroidManifest.xml @@ -2,8 +2,8 @@ <!-- BEGIN_INCLUDE(manifest) --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.xbmc.xbmc" - android:versionCode="25" - android:versionName="13.0" > + android:versionCode="26" + android:versionName="13.1-BETA1" > <!-- This is the platform API where NativeActivity was introduced. --> <uses-sdk android:minSdkVersion="14" /> diff --git a/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh b/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh index 44f11bb34b..9aa7b73cf8 100755 --- a/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh +++ b/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh @@ -44,8 +44,8 @@ fi PACKAGE=org.xbmc.xbmc-atv2 -VERSION=13.0 -REVISION=1 +VERSION=13.1 +REVISION=0~beta1 ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb echo Creating $PACKAGE package version $VERSION revision $REVISION diff --git a/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh b/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh index eeaa07d0a3..9a8a01d8c1 100755 --- a/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh +++ b/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh @@ -45,8 +45,8 @@ fi PACKAGE=org.xbmc.xbmc-ios -VERSION=13.0 -REVISION=1 +VERSION=13.1 +REVISION=0~beta1 ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb echo Creating $PACKAGE package version $VERSION revision $REVISION diff --git a/tools/darwin/packaging/xbmc-osx/mkdmg-xbmc-osx.sh b/tools/darwin/packaging/xbmc-osx/mkdmg-xbmc-osx.sh index a2f6de2d43..537cd96ca2 100755 --- a/tools/darwin/packaging/xbmc-osx/mkdmg-xbmc-osx.sh +++ b/tools/darwin/packaging/xbmc-osx/mkdmg-xbmc-osx.sh @@ -24,8 +24,8 @@ ARCHITECTURE=`file $XBMC/Contents/MacOS/XBMC | awk '{print $NF}'` PACKAGE=org.xbmc.xbmc-osx -VERSION=13.0 -REVISION=0 +VERSION=13.1 +REVISION=0~beta1 ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_macosx-intel-${ARCHITECTURE} echo Creating $PACKAGE package version $VERSION revision $REVISION diff --git a/xbmc/GUIInfoManager.h b/xbmc/GUIInfoManager.h index aca4c8dd7f..08c62050e3 100644 --- a/xbmc/GUIInfoManager.h +++ b/xbmc/GUIInfoManager.h @@ -497,8 +497,8 @@ namespace INFO #define CONTROL_HAS_FOCUS 30000 #define VERSION_MAJOR 13 -#define VERSION_MINOR 0 -#define VERSION_TAG "" +#define VERSION_MINOR 1 +#define VERSION_TAG "-BETA1" #define LISTITEM_START 35000 #define LISTITEM_THUMB (LISTITEM_START) diff --git a/xbmc/osx/Info.plist b/xbmc/osx/Info.plist index 1e16a35a0f..c35292007b 100644 --- a/xbmc/osx/Info.plist +++ b/xbmc/osx/Info.plist @@ -9,7 +9,7 @@ <key>CFBundleExecutable</key> <string>XBMC</string> <key>CFBundleGetInfoString</key> - <string>13.0</string> + <string>13.1-beta1</string> <key>CFBundleIconFile</key> <string>xbmc.icns</string> <key>CFBundleIdentifier</key> @@ -19,7 +19,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>13.0</string> + <string>13.1-beta1</string> <key>CFBundleVersion</key> <string>r####</string> <key>CFBundleSignature</key> diff --git a/xbmc/win32/XBMC_PC.rc b/xbmc/win32/XBMC_PC.rc index 5bc5b2cb9e..e82e2a4f8a 100644 --- a/xbmc/win32/XBMC_PC.rc +++ b/xbmc/win32/XBMC_PC.rc @@ -71,12 +71,12 @@ BEGIN BEGIN VALUE "CompanyName", "Team XBMC" VALUE "FileDescription", "XBMC" - VALUE "FileVersion", "13.0" + VALUE "FileVersion", "13.1-BETA1" VALUE "InternalName", "XBMC.exe" VALUE "LegalCopyright", "Copyright (c) Team XBMC. All rights reserved." VALUE "OriginalFilename", "XBMC.exe" VALUE "ProductName", "XBMC for Windows" - VALUE "ProductVersion", "13.0" + VALUE "ProductVersion", "13.1-BETA1" END END BLOCK "VarFileInfo" |