Merge branch 'app-list-itemsize' into android-test-plugins
commit988ae39eb266584451704db29eea628f9e7608ab
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Sat, 25 Dec 2010 15:15:49 +0000 (25 16:15 +0100)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Sat, 25 Dec 2010 15:31:26 +0000 (25 16:31 +0100)
tree9cd2ced8c24c35774ffd8c974783f3c710a516a3
parent3b6c02e0b387429983a95ff46709c076a044f284
parentab46ecfc519d952f3b8de4f1642a76df5944cb4a
Merge branch 'app-list-itemsize' into android-test-plugins

Conflicts:
android/res/drawable-hdpi/notification.png
android/res/drawable-ldpi/notification.png
android/res/drawable-mdpi/notification.png
apps/plugins/CATEGORIES
apps/plugins/SUBDIRS