Merge branch 'master' into android-test-plugins
commit22050fb105534f61a4058440d87faa1b7c8c0e42
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Wed, 27 Apr 2011 04:45:56 +0000 (27 06:45 +0200)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Wed, 27 Apr 2011 04:45:56 +0000 (27 06:45 +0200)
tree0e0bd91552b1f4ad92bbf8ddfe8aec678bc031bc
parent6ab98ecd9be9b07f4421de4f5e12ec88f80a9161
parentf188625d20568c7f471a1bd01cd52fd3bb4e8735
Merge branch 'master' into android-test-plugins
apps/plugin.c
apps/plugin.h
apps/plugins/test_codec.c