| commit | 4b0cb49ee9a908de36e9ac19a60005550c3cb4b7 | |
| author | Thomas Martitz <thomas.martitz@student.htw-berlin.de> | |
| Tue, 7 Dec 2010 15:58:55 +0000 (7 16:58 +0100) | ||
| committer | Thomas Martitz <thomas.martitz@student.htw-berlin.de> | |
| Tue, 7 Dec 2010 15:58:55 +0000 (7 16:58 +0100) | ||
| tree | e82495791a8ea29b44ee773c3e09b39db9e35eeb | treesnapshot (tar.gz zip) |
| parent | 4bc6904ac1039f1c3f6d698dcfada30b725411f8 | commitdiff |
| parent | 68a566d3a5b3ec9ce070015207f0a3d790b85210 | commitdiff |
Merge branch 'master' into android-test-plugins
Conflicts:
firmware/common/rbpaths.c
tools/configure
Conflicts:
firmware/common/rbpaths.c
tools/configure
| firmware/SOURCES | diff1 | diff2 | blobhistory |
| tools/configure | diff1 | diff2 | blobhistory |