Merge branch 'master' into drivers/alsa
authorGabriel M. Beddingfield <gabriel@teuton.org>
Sat, 25 Jun 2011 14:42:36 +0000 (09:42 -0500)
committerGabriel M. Beddingfield <gabriel@teuton.org>
Sat, 25 Jun 2011 14:42:36 +0000 (09:42 -0500)
commit1a83459fc172415a91593a946a2e8e6981851380
tree60c3106fe3d98bca97c3c7324b2246ee27d5e7c4
parent750488faee50258377e0cf83a700367955cb38f9
parente43cd255e2bf27737d3312974b0d0837066904b4
Merge branch 'master' into drivers/alsa

Conflicts:
src/CMakeLists.txt
src/Engine.cpp
src/CMakeLists.txt
src/Engine.cpp