Merge branch 'openelec-4.0' of https://github.com/OpenELEC/OpenELEC.tv into openelec-4.0

Browse Source

Conflicts:
	projects/RPi/patches/linux/linux-01-RPi_support-f7bef2e.patch

...

This commit is contained in:

Stephan Raue

2014-03-05 17:30:57 +01:00

parent 99e7690338 ec52d9dbe0

commit 7d79d400fa

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available