| commit | 4f0ffe7835acf4702a82b4ebd18b24db3ed564a8 | |
| author | Thomas Martitz <thomas.martitz@student.htw-berlin.de> | |
| Mon, 25 Oct 2010 21:33:02 +0000 (25 23:33 +0200) | ||
| committer | Thomas Martitz <thomas.martitz@student.htw-berlin.de> | |
| Mon, 25 Oct 2010 21:33:02 +0000 (25 23:33 +0200) | ||
| tree | bfad5b1fa80385b3bbcefc76be5b1bf9438a3ea4 | treesnapshot (tar.gz zip) |
| parent | bdff918de42439d17d7923ff2aa8801707307b9a | commitdiff |
| parent | 4e3130a502359e22118b8dfc4414915267a6f60d | commitdiff |
Merge branch 'kinetic_scroll' into android-test-plugins
Conflicts:
apps/plugin.c
apps/plugin.h
Conflicts:
apps/plugin.c
apps/plugin.h