| commit | b6501c7d2443a3531881740ce562af2e4fb260f1 | |
| author | Thomas Martitz <thomas.martitz@student.htw-berlin.de> | |
| Thu, 2 Dec 2010 22:35:10 +0000 (2 23:35 +0100) | ||
| committer | Thomas Martitz <thomas.martitz@student.htw-berlin.de> | |
| Thu, 2 Dec 2010 22:35:10 +0000 (2 23:35 +0100) | ||
| tree | 422166bd012d238f524bf3a0f6bddadff5bc2409 | treesnapshot (tar.gz zip) |
| parent | c3942bb9e650f76256f377622c2c9d2a952cb7c9 | commitdiff |
| parent | 069ce0b707376394068460e74050e75592f4b2db | commitdiff |
Merge branch 'master' into android-test-plugins
Conflicts:
firmware/libc/sscanf.c
Conflicts:
firmware/libc/sscanf.c
| apps/plugins/test_codec.c | diff1 | diff2 | blobhistory |
| tools/configure | diff1 | diff2 | blobhistory |