Fix post-merge problems.
commit66bf7982de715dd324ced73ca1dd0726b684b2e2
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Mon, 10 May 2010 10:30:07 +0000 (10 12:30 +0200)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Mon, 10 May 2010 10:30:07 +0000 (10 12:30 +0200)
treeb751ce5e7636c679caeb55b36c24eb38f782378d
parent84f1680499d4d09e2e910ac1ae08164723d3217d
Fix post-merge problems.
firmware/SOURCES
uisimulator/sdl/sound.c [deleted file]