diff options
| author | acid-burn <acid-burn@opendreambox.org> | 2009-12-15 19:33:32 +0100 |
|---|---|---|
| committer | acid-burn <acid-burn@opendreambox.org> | 2009-12-15 19:33:32 +0100 |
| commit | 1eb03ca87ad5537ec41506a84f32c90774a66f1b (patch) | |
| tree | d19b47e1e7a2ddd14ac4c81bc771a2cd85f3b909 /lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta | |
| parent | defadb893d6897935165b63a9de09b95f43dfcc1 (diff) | |
| download | enigma2-1eb03ca87ad5537ec41506a84f32c90774a66f1b.tar.gz enigma2-1eb03ca87ad5537ec41506a84f32c90774a66f1b.zip | |
fix merge conflict.
Diffstat (limited to 'lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta')
0 files changed, 0 insertions, 0 deletions