Merge branch 'app-paths' into android-test-plugins
commitbeb54c1486e865d5860829fdd6751897074555e6
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Sat, 4 Dec 2010 18:20:40 +0000 (4 19:20 +0100)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Sat, 4 Dec 2010 18:20:40 +0000 (4 19:20 +0100)
tree3326e583ab58c5117a93f58b4622684764aa07e2
parentb6501c7d2443a3531881740ce562af2e4fb260f1
parentc057fcc0b6879813e166fdd57a15146baae47ad2
Merge branch 'app-paths' into android-test-plugins
apps/main.c
apps/plugin.c