summaryrefslogtreecommitdiff
path: root/apps/plugins/SUBDIRS
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/SUBDIRS
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/SUBDIRS')
-rw-r--r--apps/plugins/SUBDIRS2
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS
index f537fb8..24333be 100644
--- a/apps/plugins/SUBDIRS
+++ b/apps/plugins/SUBDIRS
@@ -1,4 +1,5 @@
#ifndef IRIVER_IFP7XX_SERIES
+#ifndef GIGABEAT_S
/* For all targets */
shortcuts
@@ -45,4 +46,5 @@ doom
mpegplayer
#endif
+#endif /* GIGABEAT_S */
#endif /* IRIVER_IFP7XX_SERIES */