Merge branch 'master' into android-test-plugins
commit2ec5329465b8569c89014e1fd8d93e25032052ef
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Sat, 5 Mar 2011 17:13:34 +0000 (5 18:13 +0100)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Sat, 5 Mar 2011 17:13:34 +0000 (5 18:13 +0100)
tree1c14e8b396b40383f3807f98b3b7ab0006373710
parent34e753382163b4393120e6145f571e826ba3e3a3
parent0930c578955054a1b09a9377894212a586cddbc4
Merge branch 'master' into android-test-plugins
apps/plugin.h