Merge branch 'master' into sim-target-tree
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Sat, 15 May 2010 19:54:23 +0000 (21:54 +0200)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Sat, 15 May 2010 19:54:23 +0000 (21:54 +0200)
commit37bac298458d3b473031901dcf217f6e2803f3b0
tree9f8fb29e21b83c59287398bce2ae03211dca25ca
parent15e56098eb583ee0fb6270929c5a7ef856ac7f48
parent769f29aa075f8d8b78012042f9d313afdab8b2bf
Merge branch 'master' into sim-target-tree

Conflicts:
firmware/sound.c
firmware/target/hosted/sdl/pcm-sdl.c
firmware/SOURCES
firmware/drivers/audio/sdl.c
firmware/export/audiohw.h
firmware/sound.c