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/plugins/SUBDIRS | |
| 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/plugins/SUBDIRS')
| -rw-r--r-- | apps/plugins/SUBDIRS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS index f537fb8965..24333be3b9 100644 --- a/apps/plugins/SUBDIRS +++ b/apps/plugins/SUBDIRS | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | #ifndef IRIVER_IFP7XX_SERIES | 1 | #ifndef IRIVER_IFP7XX_SERIES |
| 2 | #ifndef GIGABEAT_S | ||
| 2 | 3 | ||
| 3 | /* For all targets */ | 4 | /* For all targets */ |
| 4 | shortcuts | 5 | shortcuts |
| @@ -45,4 +46,5 @@ doom | |||
| 45 | mpegplayer | 46 | mpegplayer |
| 46 | #endif | 47 | #endif |
| 47 | 48 | ||
| 49 | #endif /* GIGABEAT_S */ | ||
| 48 | #endif /* IRIVER_IFP7XX_SERIES */ | 50 | #endif /* IRIVER_IFP7XX_SERIES */ |