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

Browse Source

Conflicts:
	packages/sysutils/remote/eventlircd/config/evmap/03_0755_2626.evmap

...

This commit is contained in:

Stephan Raue

2011-04-26 17:46:51 +02:00

parent 8734e2bb4b 7eca5bd192

commit 5376d8fec5

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