Merge branch 'master' into android-test-plugins
commitf3924dc0e32b6129e057eb0be5ce7d917dc518a1
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Fri, 13 May 2011 10:52:53 +0000 (13 12:52 +0200)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Fri, 13 May 2011 10:52:53 +0000 (13 12:52 +0200)
treed9b3da9634d670f3160aefaced14fea6b33111f5
parentee4320d236f5d33d5cc3818363bab844ad265f9e
parent5d74a45e9aef6f5e0e1668d721d9d14c59177ac6
Merge branch 'master' into android-test-plugins
apps/plugin.c
apps/plugin.h