diff options
| author | Lars Op den Kamp <lars@opdenkamp.eu> | 2011-01-04 12:45:56 +0100 |
|---|---|---|
| committer | Lars Op den Kamp <lars@opdenkamp.eu> | 2011-01-04 12:54:22 +0100 |
| commit | f9f5c75a784710732c316f248133a0e12ebc7f8d (patch) | |
| tree | fda97e8e9beec42659aa2db1f19d5ca8abf493c6 /system | |
| parent | 4a974cefffb96d253ccff5fc2cea377fde9064e4 (diff) | |
merge leftovers
Diffstat (limited to 'system')
| -rw-r--r-- | system/keymaps/keyboard.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml index c64c0ea512..9c6d88b810 100644 --- a/system/keymaps/keyboard.xml +++ b/system/keymaps/keyboard.xml @@ -607,5 +607,4 @@ <backspace>PreviousMenu</backspace> </keyboard> </MyTVSettings> ->>>>>>> merge pvr-testing2 svn rev 32591 into trunk </keymap> |