Merge branch 'master' into android-notification
commitf009629a9aa10f2d0313dfda1f1f783ae441a13a
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Tue, 7 Dec 2010 15:57:10 +0000 (7 16:57 +0100)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Tue, 7 Dec 2010 15:57:10 +0000 (7 16:57 +0100)
tree9ccb9cfb934586f51cae591b8ff522a3da544b88
parent642762b8048e94dde2084dacda5e845a7573b24e
parent68a566d3a5b3ec9ce070015207f0a3d790b85210
Merge branch 'master' into android-notification
android/src/org/rockbox/RockboxService.java
apps/main.c
firmware/SOURCES