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/plugins/SOURCES | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'apps/plugins/SOURCES')

diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index 8479cd8b9b..d581906637 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -1,3 +1,4 @@
+#ifndef GIGABEAT_S
 /* plugins common to all models */
 battery_bench.c
 chessclock.c
@@ -13,6 +14,7 @@ random_folder_advance_config.c
 rockblox.c
 rockbox_flash.c
 search.c
+shortcuts.c
 snow.c
 sort.c
 stats.c
@@ -144,3 +146,4 @@ iriver_flash.c
 /* Built for bitmap targets except H10 5/6gb, Archoses, iPod mini and ifp */
 superdom.c
 #endif
+#endif /* GIGABEAT_S */
-- 
cgit v1.2.3