| commit | 37bac298458d3b473031901dcf217f6e2803f3b0 | |
| author | Thomas Martitz <thomas.martitz@student.htw-berlin.de> | |
| Sat, 15 May 2010 19:54:23 +0000 (15 21:54 +0200) | ||
| committer | Thomas Martitz <thomas.martitz@student.htw-berlin.de> | |
| Sat, 15 May 2010 19:54:23 +0000 (15 21:54 +0200) | ||
| tree | 9f8fb29e21b83c59287398bce2ae03211dca25ca | treesnapshot (tar.gz zip) |
| parent | 15e56098eb583ee0fb6270929c5a7ef856ac7f48 | commitdiff |
| parent | 769f29aa075f8d8b78012042f9d313afdab8b2bf | commitdiff |
Merge branch 'master' into sim-target-tree
Conflicts:
firmware/sound.c
firmware/target/hosted/sdl/pcm-sdl.c
Conflicts:
firmware/sound.c
firmware/target/hosted/sdl/pcm-sdl.c
| firmware/SOURCES | diff1 | diff2 | blobhistory |
| firmware/drivers/audio/sdl.c | diff1 | blobhistory | |
| firmware/export/audiohw.h | diff1 | diff2 | blobhistory |
| firmware/sound.c | diff1 | diff2 | blobhistory |