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

Conflicts:
	CHANGELOG
This commit is contained in:
Stephan Raue
2011-10-22 02:16:16 +02:00
3 changed files with 2 additions and 19 deletions
+1
View File
@@ -14,3 +14,4 @@ Added functions:
Removed functions:
- remove netmount.conf (XBMC includes native NFS/AFP/CIFS/SSH support)