Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

Browse Source

Conflicts:
	packages/network/connman/tmpfiles.d/21_connman.conf
	packages/network/openssh/tmpfiles.d/51_sshd.conf
	packages/security/polkit/tmpfiles.d/34_polkit.conf
	packages/sysutils/busybox/tmpfiles.d/02_busybox.conf
	packages/sysutils/dbus/tmpfiles.d/14_dbus.conf
	packages/sysutils/remote/atvclient/tmpfiles.d/63_atvclient.conf
	packages/sysutils/remote/eventlircd/tmpfiles.d/62_eventlircd.conf
	packages/sysutils/remote/irserver/tmpfiles.d/63_irserver.conf
	packages/sysutils/remote/lirc/tmpfiles.d/61_lirc.conf
	packages/sysutils/systemd/init.d/02_tmpfiles

...

This commit is contained in:

Stephan Raue 2013-07-12 23:51:39 +02:00

parent 1ee360864d 9ce6363d6c

commit 579684502a

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