Merge branch 'master' into android-test-plugins
commit81ba0d139b59afce8b277fa75c62b73a7b01dd35
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Wed, 23 Feb 2011 01:18:10 +0000 (23 02:18 +0100)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Wed, 23 Feb 2011 01:18:10 +0000 (23 02:18 +0100)
tree101330651d57691b5ac914537674b0269fd183cf
parent1c1573d496808b3fbb1ce477cc87bb7ebb509c9e
parentfc45863a45958248f34f2fe11b9e7aa47588bb72
Merge branch 'master' into android-test-plugins
apps/plugins/fft/fft.c
apps/plugins/mpegplayer/mpegplayer.c
tools/configure
tools/root.make