mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-12-08 20:55:17 -05:00
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
This commit is contained in:
parent
a26110c52d
commit
590501cfe4
57 changed files with 4016 additions and 17 deletions
|
|
@ -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 */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue