summaryrefslogtreecommitdiff
path: root/apps/plugins/SOURCES
diff options
context:
space:
mode:
authorWill Robertson <aliask@rockbox.org>2007-09-21 15:51:53 +0000
committerWill Robertson <aliask@rockbox.org>2007-09-21 15:51:53 +0000
commit590501cfe404b5463adecc70628e5bc7c8f142a2 (patch)
tree3b038f90c9c3bbef8cf0b84f5a4ea338f9599851 /apps/plugins/SOURCES
parenta26110c52dff9bc15d20146462d52d07f61bd238 (diff)
downloadrockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.zip
rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.tar.gz
rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.tar.bz2
rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.tar.xz
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/plugins/SOURCES')
-rw-r--r--apps/plugins/SOURCES3
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index 8479cd8..d581906 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 */