Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-systemd

Browse Source

Conflicts:
	packages/security/polkit/package.mk
	packages/sysutils/udisks/init.d/31_mount-disks

...

This commit is contained in:

Stephan Raue 2013-08-07 12:41:33 +02:00

parent 5708fe10c6 9bcf835a1b

commit 8cd3454337

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

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

Diff Content Not Available