Merge branch 'master' into gsoc2-audiobuf-accesses
commitbc1a34ca86e4d81731d7ca269904d25579aaf2ee
authorThomas Martitz <kugel@rockbox.org>
Wed, 3 Aug 2011 10:10:41 +0000 (3 12:10 +0200)
committerThomas Martitz <kugel@rockbox.org>
Wed, 3 Aug 2011 10:10:41 +0000 (3 12:10 +0200)
tree443aee71e44647cdc95b157cca0571ec0f41a7ca
parent2a6e9353784ad08e61163e31e2aacab6bab50d19
parent52ce22bfc908773fc9d3ac517c997929d740b2af
Merge branch 'master' into gsoc2-audiobuf-accesses
apps/filetree.c
apps/playlist.c
apps/plugin.c
apps/plugin.h
apps/tagcache.c