Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: xbmc/xbmc
...
head fork: xbmc/xbmc
  • 19 commits
  • 6 files changed
  • 4 commit comments
  • 5 contributors
Commits on Dec 11, 2011
theuni release: version strings bump for beta1 8d7d09f
@Memphiz Memphiz [change] - beta splash screen 379d13c
Commits on Dec 21, 2011
@Memphiz Memphiz [ios/atv2] - set deb package version to 11.0-0~b1 for eden beta1 bbd922c
Commits on Dec 23, 2011
theuni Merge commit '4027e43dd' into Eden b9f690e
vdrfan fixed: hide watched + watched overlay not working with sets
(cherry picked from commit bfc7d9f)
6ce836a
theuni addons: add simplejson to default install
It's needed for wunderground.
(cherry picked from commit 3617309)
22ad8e4
Commits on Jan 19, 2012
theuni Merge branch 'master' into Eden 524f2a6
theuni release: version strings bump for beta2 fd08f6d
Commits on Jan 20, 2012
theuni Merge remote-tracking branch 'origin/master' into Eden 9ddc38a
Commits on Jan 21, 2012
theuni Merge remote-tracking branch 'origin/master' into Eden d4178b1
theuni splash: beta2 splash. stands out more. f76c547
Commits on Jan 22, 2012
@koenkooi koenkooi [gles] GL_BGRA does not exist for every GLES implementation
The GLES implementation that TI supports for the catalog chips lacks GL_BGRA

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
acbc01f
@davilla davilla Merge pull request #650 from koenkooi/gles-fixes
Gles fixes
f119e6a
Commits on Feb 07, 2012
theuni Merge remote-tracking branch 'origin/master' into Eden a102982
theuni release: version strings bump for beta3 52e9d21
theuni splash: updated for b3 1fef727
Commits on Feb 26, 2012
theuni Merge remote-tracking branch 'origin/master' into Eden 831626e
theuni release: version strings bump for rc1 998687d
theuni release: use final Eden splash 30312f1
View
BIN  media/Splash.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
4 tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh
@@ -44,8 +44,8 @@ fi
PACKAGE=org.xbmc.xbmc-atv2
-VERSION=10.0
-REVISION=9
+VERSION=11.0
+REVISION=0~rc1
ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb
echo Creating $PACKAGE package version $VERSION revision $REVISION
View
4 tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh
@@ -45,8 +45,8 @@ fi
PACKAGE=org.xbmc.xbmc-ios
-VERSION=10.0
-REVISION=9
+VERSION=11.0
+REVISION=0~rc1
ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb
echo Creating $PACKAGE package version $VERSION revision $REVISION
View
2  xbmc/GUIInfoManager.h
@@ -424,7 +424,7 @@ namespace INFO
#define VERSION_MAJOR 11
#define VERSION_MINOR 0
-#define VERSION_TAG "-PRE"
+#define VERSION_TAG "-RC1"
#define LISTITEM_START 35000
#define LISTITEM_THUMB (LISTITEM_START)
View
4 xbmc/osx/Info.plist
@@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>XBMC</string>
<key>CFBundleGetInfoString</key>
- <string>11.0.pre</string>
+ <string>11.0.rc1</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>11.0.pre</string>
+ <string>11.0.rc1</string>
<key>CFBundleVersion</key>
<string>r####</string>
<key>CFBundleSignature</key>
View
4 xbmc/win32/XBMC_PC.rc
@@ -71,12 +71,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Team XBMC"
VALUE "FileDescription", "XBMC"
- VALUE "FileVersion", "PRE-11.0"
+ VALUE "FileVersion", "11.0-RC1"
VALUE "InternalName", "XBMC.exe"
VALUE "LegalCopyright", "Copyright (c) Team XBMC. All rights reserved."
VALUE "OriginalFilename", "XBMC.exe"
VALUE "ProductName", "XBMC for Windows"
- VALUE "ProductVersion", "PRE-11.0"
+ VALUE "ProductVersion", "11.0-RC1"
END
END
BLOCK "VarFileInfo"

Showing you all comments on commits in this comparison.

@jmarshallnz

Was this meant to hit master?

@davilla

yes, it breaks compile on certain embedded platforms.

@jmarshallnz

Sure - you committed it to Eden, not master :)

@davilla

Ahh for crying out loud :(

Something went wrong with that request. Please try again.