| commit | d611f939f2364c429aae9bb91f82d29f12e0ac05 | |
| author | Thomas Martitz <thomas.martitz@student.htw-berlin.de> | |
| Tue, 15 Mar 2011 09:54:32 +0000 (15 10:54 +0100) | ||
| committer | Thomas Martitz <thomas.martitz@student.htw-berlin.de> | |
| Tue, 15 Mar 2011 09:54:32 +0000 (15 10:54 +0100) | ||
| tree | b9ab0e44ffc9bf5117c590f0315e429bae278b47 | treesnapshot (tar.gz zip) |
| parent | 2ec5329465b8569c89014e1fd8d93e25032052ef | commitdiff |
| parent | 48e110f774a914978732f84eac6438e18baa7944 | commitdiff |
Merge branch 'master' into android-test-plugins
Conflicts:
firmware/drivers/lcd-16bit.c
Conflicts:
firmware/drivers/lcd-16bit.c
| apps/plugin.c | diff1 | diff2 | blobhistory |
| apps/plugin.h | diff1 | diff2 | blobhistory |
| tools/Makefile | diff1 | diff2 | blobhistory |
| tools/root.make | diff1 | diff2 | blobhistory |