From 590501cfe404b5463adecc70628e5bc7c8f142a2 Mon Sep 17 00:00:00 2001
From: Will Robertson <aliask@rockbox.org>
Date: Fri, 21 Sep 2007 15:51:53 +0000
Subject: 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
---
 apps/SOURCES | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'apps/SOURCES')

diff --git a/apps/SOURCES b/apps/SOURCES
index 04d9e76..5a3dc89 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -143,6 +143,8 @@ keymaps/keymap-player.c
 keymaps/keymap-x5.c
 #elif CONFIG_KEYPAD == GIGABEAT_PAD
 keymaps/keymap-gigabeat.c
+#elif CONFIG_KEYPAD == GIGABEAT_S_PAD
+keymaps/keymap-gigabeat-s.c
 #elif CONFIG_KEYPAD == IRIVER_H10_PAD
 keymaps/keymap-h10.c
 #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
-- 
cgit v1.1