Merge branch 'master' into sim-target-tree
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Fri, 14 May 2010 09:03:35 +0000 (11:03 +0200)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Fri, 14 May 2010 09:03:35 +0000 (11:03 +0200)
commit01fff330c54d8ab05a751108efa88c9c44dfdc59
treed10f19a921b3e3e82cd516d68711ea1b682ac2b6
parenta2f04b1870c3de9bbb07e3d842828f9d74d8f6f9
parent048c8e11b497d90428d7917b511ceefb6850d2a2
Merge branch 'master' into sim-target-tree
firmware/export/config/sim.h
firmware/export/system.h
firmware/sound.c
firmware/target/hosted/sdl/pcm-sdl.c