| commit | 76b3e7b0bbc1b16ef81a6b5ea3dcb1225921b38c | |
| author | Thomas Martitz <thomas.martitz@student.htw-berlin.de> | |
| Mon, 21 Jun 2010 17:34:43 +0000 (21 19:34 +0200) | ||
| committer | Thomas Martitz <thomas.martitz@student.htw-berlin.de> | |
| Mon, 21 Jun 2010 17:34:43 +0000 (21 19:34 +0200) | ||
| tree | 6379e3d1a0388190fa41bab87fc2bc99dfbb927c | treesnapshot (tar.gz zip) |
| parent | df9e1147c480fe3140f8d21a707439d933eb795d | commitdiff |
| parent | 4673ef9044f34be0de878d4b60dc41d0242c6239 | commitdiff |
Merge branch 'master' into gsoc-app-target
Conflicts:
apps/codecs/libm4a/demux.c
apps/plugins/chip8.c
apps/recorder/peakmeter.c
firmware/backlight.c
Conflicts:
apps/codecs/libm4a/demux.c
apps/plugins/chip8.c
apps/recorder/peakmeter.c
firmware/backlight.c
| apps/debug_menu.c | diff1 | diff2 | blobhistory |
| firmware/SOURCES | diff1 | diff2 | blobhistory |
| tools/configure | diff1 | diff2 | blobhistory |