| commit | 2035b403baefaedb3e4277ff0b15e5b242c5b136 | |
| author | Thomas Martitz <thomas.martitz@student.htw-berlin.de> | |
| Sun, 1 Aug 2010 17:01:06 +0000 (1 19:01 +0200) | ||
| committer | Thomas Martitz <thomas.martitz@student.htw-berlin.de> | |
| Sun, 1 Aug 2010 17:01:06 +0000 (1 19:01 +0200) | ||
| tree | 8243699a9a0553d88d3707c5800cdf63612b56e4 | treesnapshot (tar.gz zip) |
| parent | caa2e6984f7cba10f2b2a6cbad7e3c43651ce618 | commitdiff |
| parent | d2c1493249dc32576248b47e9de43caebad72eef | commitdiff |
Merge branch 'master' into gsoc-android-botloader
Conflicts:
apps/codecs.c
apps/recorder/recording.c
apps/tagcache.c
firmware/common/rbpaths.c
firmware/export/rbpaths.h
tools/configure
uisimulator/common/io.c
Conflicts:
apps/codecs.c
apps/recorder/recording.c
apps/tagcache.c
firmware/common/rbpaths.c
firmware/export/rbpaths.h
tools/configure
uisimulator/common/io.c
| apps/codecs/mpa.c | diff1 | diff2 | blobhistory |
| tools/configure | diff1 | diff2 | blobhistory |
| uisimulator/common/io.c | diff1 | diff2 | blobhistory |