Merge branch 'master' into android-test-plugins
commitcda3b19decfa6e7de0fe3ab2a9daefa243d8ca53
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Wed, 16 Mar 2011 15:31:25 +0000 (16 16:31 +0100)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Wed, 16 Mar 2011 15:31:25 +0000 (16 16:31 +0100)
treee776d3d5b2156932f994ff3a4e7c79be1f3750fd
parentd611f939f2364c429aae9bb91f82d29f12e0ac05
parent8f34278110d7b73f40d9dd35207fa937581e4d55
Merge branch 'master' into android-test-plugins
apps/plugin.c
apps/plugin.h
apps/plugins/test_codec.c