Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #2108 from MartijnKaijser/grAEKen_master

[release] version bump to 13.0 alpha1 as we start new merge windows
  • Loading branch information...
commit fdf4686ce3b5e7ecd505f3f0a932e90965fb2481 2 parents 70a692d + cc2cf05
Martijn Kaijser MartijnKaijser authored
2  addons/xbmc.addon/addon.xml
View
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<addon id="xbmc.addon" version="12.0.0" provider-name="Team XBMC">
+<addon id="xbmc.addon" version="12.9.1" provider-name="Team XBMC">
<backwards-compatibility abi="12.0"/>
<requires>
<import addon="xbmc.core" version="0.1.0"/>
2  configure.in
View
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([xbmc], [12.0rc3], [http://trac.xbmc.org])
+AC_INIT([xbmc], [12.9.1], [http://trac.xbmc.org])
AC_CONFIG_HEADERS([xbmc/config.h])
AH_TOP([#pragma once])
m4_include([m4/ax_python_devel.m4])
BIN  media/Splash.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 tools/android/packaging/xbmc/AndroidManifest.xml
View
@@ -2,8 +2,8 @@
<!-- BEGIN_INCLUDE(manifest) -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.xbmc.xbmc"
- android:versionCode="5"
- android:versionName="12.0-RC3" >
+ android:versionCode="7"
+ android:versionName="13.0-ALPHA1" >
<!-- This is the platform API where NativeActivity was introduced. -->
<uses-sdk android:minSdkVersion="9" />
4 tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh
View
@@ -44,8 +44,8 @@ fi
PACKAGE=org.xbmc.xbmc-atv2
-VERSION=12.0
-REVISION=0~rc3
+VERSION=13.0
+REVISION=0~alpha1
ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb
echo Creating $PACKAGE package version $VERSION revision $REVISION
4 tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh
View
@@ -45,8 +45,8 @@ fi
PACKAGE=org.xbmc.xbmc-ios
-VERSION=12.0
-REVISION=0~rc3
+VERSION=13.0
+REVISION=0~alpha1
ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb
echo Creating $PACKAGE package version $VERSION revision $REVISION
4 xbmc/GUIInfoManager.h
View
@@ -502,9 +502,9 @@ namespace INFO
#define CONTROL_GROUP_HAS_FOCUS 29999
#define CONTROL_HAS_FOCUS 30000
-#define VERSION_MAJOR 12
+#define VERSION_MAJOR 13
#define VERSION_MINOR 0
-#define VERSION_TAG "-RC3"
+#define VERSION_TAG "-ALPHA1"
#define LISTITEM_START 35000
#define LISTITEM_THUMB (LISTITEM_START)
4 xbmc/osx/Info.plist
View
@@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>XBMC</string>
<key>CFBundleGetInfoString</key>
- <string>12.0.rc3</string>
+ <string>13.0.alpha1</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>12.0.rc3</string>
+ <string>13.0.alpha1</string>
<key>CFBundleVersion</key>
<string>r####</string>
<key>CFBundleSignature</key>
4 xbmc/win32/XBMC_PC.rc
View
@@ -71,12 +71,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Team XBMC"
VALUE "FileDescription", "XBMC"
- VALUE "FileVersion", "12.0-RC3"
+ VALUE "FileVersion", "13.0-ALPHA1"
VALUE "InternalName", "XBMC.exe"
VALUE "LegalCopyright", "Copyright (c) Team XBMC. All rights reserved."
VALUE "OriginalFilename", "XBMC.exe"
VALUE "ProductName", "XBMC for Windows"
- VALUE "ProductVersion", "12.0-RC3"
+ VALUE "ProductVersion", "13.0-ALPHA1"
END
END
BLOCK "VarFileInfo"
Please sign in to comment.
Something went wrong with that request. Please try again.