diff options
| author | Will Robertson <aliask@rockbox.org> | 2007-09-21 15:51:53 +0000 |
|---|---|---|
| committer | Will Robertson <aliask@rockbox.org> | 2007-09-21 15:51:53 +0000 |
| commit | 590501cfe404b5463adecc70628e5bc7c8f142a2 (patch) | |
| tree | 3b038f90c9c3bbef8cf0b84f5a4ea338f9599851 /apps/SOURCES | |
| parent | a26110c52dff9bc15d20146462d52d07f61bd238 (diff) | |
| download | rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.tar.gz rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.zip | |
Merge the Gigabeat S branch back into trunk. Fingers crossed nothing breaks.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14805 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/SOURCES')
| -rw-r--r-- | apps/SOURCES | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/SOURCES b/apps/SOURCES index 04d9e76c51..5a3dc89c2e 100644 --- a/apps/SOURCES +++ b/apps/SOURCES | |||
| @@ -143,6 +143,8 @@ keymaps/keymap-player.c | |||
| 143 | keymaps/keymap-x5.c | 143 | keymaps/keymap-x5.c |
| 144 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 144 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
| 145 | keymaps/keymap-gigabeat.c | 145 | keymaps/keymap-gigabeat.c |
| 146 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD | ||
| 147 | keymaps/keymap-gigabeat-s.c | ||
| 146 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 148 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
| 147 | keymaps/keymap-h10.c | 149 | keymaps/keymap-h10.c |
| 148 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | 150 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD |