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

Browse Source

Conflicts:
	packages/mediacenter/xbmc/tmpfiles.d/xbmc.conf
	packages/network/connman/tmpfiles.d/21_connman.conf
	packages/sysutils/busybox/tmpfiles.d/02_busybox.conf
	packages/sysutils/udisks/tmpfiles.d/udisks.conf
	packages/x11/other/fontconfig/init.d/35_fontconfig

...

This commit is contained in:

Stephan Raue 2013-08-06 15:23:55 +02:00

parent fe466b1a2e 1ece5d4a18

commit aca9d5192a

1 changed files with 1 additions and 1 deletions

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