aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Kaijser <mcm.kaijser@gmail.com>2013-10-20 19:51:08 +0200
committerMartijn Kaijser <mcm.kaijser@gmail.com>2013-10-20 19:51:08 +0200
commit885dfbcfb9afe5303de3bf65be52d67faabb97fa (patch)
tree1fece70aba1301ed5bc5d577230649ada1c7e593
parent65d92a7651db694653c1b9dc5d28f28d6ac66b58 (diff)
[release] bump version to 12.3
-rw-r--r--configure.in2
-rw-r--r--media/Splash.pngbin32044 -> 32469 bytes
-rw-r--r--tools/android/packaging/xbmc/AndroidManifest.xml4
-rwxr-xr-xtools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh2
-rwxr-xr-xtools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh2
-rw-r--r--xbmc/GUIInfoManager.h2
-rw-r--r--xbmc/osx/Info.plist4
-rw-r--r--xbmc/win32/XBMC_PC.rc8
8 files changed, 12 insertions, 12 deletions
diff --git a/configure.in b/configure.in
index e98cc953c8..a9bd5d01c6 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([xbmc], [12.2], [http://trac.xbmc.org])
+AC_INIT([xbmc], [12.3], [http://trac.xbmc.org])
AC_CONFIG_HEADERS([xbmc/config.h])
AH_TOP([#pragma once])
m4_include([m4/ax_python_devel.m4])
diff --git a/media/Splash.png b/media/Splash.png
index e82ecc22de..84ef69f56b 100644
--- a/media/Splash.png
+++ b/media/Splash.png
Binary files differ
diff --git a/tools/android/packaging/xbmc/AndroidManifest.xml b/tools/android/packaging/xbmc/AndroidManifest.xml
index 27d72709ca..4b669d7cc9 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="9"
- android:versionName="12.2" >
+ android:versionCode="10"
+ android:versionName="12.3" >
<!-- This is the platform API where NativeActivity was introduced. -->
<uses-sdk android:minSdkVersion="9" />
diff --git a/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh b/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh
index 4fa3b1e123..68ba7d95fa 100755
--- a/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh
+++ b/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh
@@ -44,7 +44,7 @@ fi
PACKAGE=org.xbmc.xbmc-atv2
-VERSION=12.2
+VERSION=12.3
REVISION=0
ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb
diff --git a/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh b/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh
index d7ca429db8..cd0aa4082e 100755
--- a/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh
+++ b/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh
@@ -45,7 +45,7 @@ fi
PACKAGE=org.xbmc.xbmc-ios
-VERSION=12.2
+VERSION=12.3
REVISION=0
ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb
diff --git a/xbmc/GUIInfoManager.h b/xbmc/GUIInfoManager.h
index 6d8b70f964..1b6364f3d0 100644
--- a/xbmc/GUIInfoManager.h
+++ b/xbmc/GUIInfoManager.h
@@ -503,7 +503,7 @@ namespace INFO
#define CONTROL_HAS_FOCUS 30000
#define VERSION_MAJOR 12
-#define VERSION_MINOR 2
+#define VERSION_MINOR 3
#define VERSION_TAG ""
#define LISTITEM_START 35000
diff --git a/xbmc/osx/Info.plist b/xbmc/osx/Info.plist
index 7cd1235cac..1025c50226 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>12.2</string>
+ <string>12.3</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.2</string>
+ <string>12.3</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 0da456789b..023ffca999 100644
--- a/xbmc/win32/XBMC_PC.rc
+++ b/xbmc/win32/XBMC_PC.rc
@@ -53,8 +53,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 12,2,0,0
- PRODUCTVERSION 12,2,0,0
+ FILEVERSION 12,3,0,0
+ PRODUCTVERSION 12,3,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -71,12 +71,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Team XBMC"
VALUE "FileDescription", "XBMC"
- VALUE "FileVersion", "12.2"
+ VALUE "FileVersion", "12.3"
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.2"
+ VALUE "ProductVersion", "12.3"
END
END
BLOCK "VarFileInfo"