Merge branch 'master' into PVR

Conflicts: addon.xml
JezzX · Mar 2, 2012 · 1f47152 · 1f47152
2 parents 7fda30d + 4e9b31a
commit 1f47152
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 1 deletion.
diff --git a/_screenshots/screenshot01.jpg b/_screenshots/screenshot01.jpg
diff --git a/_screenshots/screenshot02.jpg b/_screenshots/screenshot02.jpg
diff --git a/_screenshots/screenshot03.jpg b/_screenshots/screenshot03.jpg
diff --git a/_screenshots/screenshot04.jpg b/_screenshots/screenshot04.jpg
diff --git a/_screenshots/screenshot05.jpg b/_screenshots/screenshot05.jpg
diff --git a/_screenshots/screenshot06.jpg b/_screenshots/screenshot06.jpg
diff --git a/_screenshots/screenshot07.jpg b/_screenshots/screenshot07.jpg
diff --git a/_screenshots/screenshot08.jpg b/_screenshots/screenshot08.jpg
diff --git a/_screenshots/screenshot09.jpg b/_screenshots/screenshot09.jpg
diff --git a/_screenshots/screenshot10.jpg b/_screenshots/screenshot10.jpg
diff --git a/addon.xml b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="skin.pm3-hd-pvr"
-  version="2.1.0"
+  version="2.1.1"
   name="PM3.HD for PVR"
   provider-name="Jezz_X, Team XBMC">
   <requires>

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,13 @@
+[B]Version 2.1.1[/B]
+
+- More Compatibility changes needed for eden XBMC (Weather and Peripherals)
+- Added more Codec flagging images to bring it up to date with Confluence
+- Only show the eject drive button on systems that have Optical media inserted (again better for embedded systems)
+- Don't show exit button on embedded systems that have it disabled
+- Sized down the XBMC logo in a home a little
+- Fixed up the subtitle window to work with the latest versions of the add-on
+- Fixed Couldn't set custom movies Background for home
+
 [B]Version 2.0.0[/B]
 
 - Removed all the old stuff that is not compatible with eden XBMC and changed the bits that needed changing for eden