Merge branch 'openelec-next' of github.com:OpenELEC/OpenELEC.tv

Conflicts: CHANGELOG
Nachtzuster · Oct 22, 2011 · 6dc7e79 · 6dc7e79
2 parents 6956c90 + 600360b
commit 6dc7e79
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 19 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -14,3 +14,4 @@ Added functions:
 
 Removed functions:
   - remove netmount.conf (XBMC includes native NFS/AFP/CIFS/SSH support)
+
diff --git a/packages/linux-firmware/dvb-firmware/meta b/packages/linux-firmware/dvb-firmware/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="dvb-firmware"
-PKG_VERSION="0.0.14"
+PKG_VERSION="0.0.15"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"

diff --git a/packages/network/wpa_supplicant/patches/wpa_supplicant-0.7.3-01-enable_logging-0.1.patch b/packages/network/wpa_supplicant/patches/wpa_supplicant-0.7.3-01-enable_logging-0.1.patch
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,3 +14,4 @@ Added functions:

		Removed functions:
		- remove netmount.conf (XBMC includes native NFS/AFP/CIFS/SSH support)