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

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
commit aca9d5192a

View File

@ -20,4 +20,4 @@
d /var/cache/xkb 0755 root root - -
d /var/lib 0755 root root - -
d /run/X11 0755 root root - -
d /run/X11 0755 root root - -