Merge remote branch 'master' into features/worker_thread
authorGabriel M. Beddingfield <gabriel@teuton.org>
Thu, 13 Jan 2011 02:15:31 +0000 (20:15 -0600)
committerGabriel M. Beddingfield <gabriel@teuton.org>
Thu, 13 Jan 2011 02:15:31 +0000 (20:15 -0600)
commit72985e081231152f0ce46e720bd12bdcc9089c6f
tree2fad9ef40637a7f9af59ebf5fe41d8bc19ae04dd
parent71a87af3c6fe9be5c3831215a546c20ae6b0bbd6
parentfb4b9c4ae833de465968dc2f553cab0240fe89b5
Merge remote branch 'master' into features/worker_thread

Conflicts:
debian/changelog
debian/compat
debian/control
src/Engine.cpp
src/CMakeLists.txt
src/Engine.cpp