Merge branch 'master' into android-test-plugins
commit6b3b5d14e5adcf5037e444b4e64c204b8b7119a4
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Wed, 2 Feb 2011 19:23:11 +0000 (2 20:23 +0100)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Wed, 2 Feb 2011 19:23:11 +0000 (2 20:23 +0100)
tree71a72171410c13664a49d98f22e1737dacce6edb
parent8c247bc8bd92ed72c7f973f25ba5558da8dda844
parent75e50dd8a955d4d3875d730f15ea334948f2a659
Merge branch 'master' into android-test-plugins
apps/buffering.c
apps/gui/bitmap/list.c
apps/plugin.h
firmware/font.c
tools/root.make