| commit | 0374e399b01db4296276f5c501d9837512d839e1 | |
| author | Thomas Martitz <kugel@rockbox.org> | |
| Mon, 4 Jul 2011 21:10:17 +0000 (4 23:10 +0200) | ||
| committer | Thomas Martitz <kugel@rockbox.org> | |
| Mon, 4 Jul 2011 21:10:17 +0000 (4 23:10 +0200) | ||
| tree | 598df8de843f58793308c1db0154855a9f8710ce | treesnapshot (tar.gz zip) |
| parent | a91dc9a148304190f7cdb15d26ecc147d24feb2b | commitdiff |
| parent | cfef3684369984f0b05909c5d9f0b5b6a339bc6a | commitdiff |
Merge branch 'master' into gsoc2-audiobuf-accesses
Conflicts:
firmware/buffer.c
firmware/common/dircache.c
Conflicts:
firmware/buffer.c
firmware/common/dircache.c