merge from lp:mixxx/1.11
merged from lp:mixxx
merged ../daschuers_trunk/mixxx/src/waveform/
compilable but crashing
fixed crash
merged from lp:mixxx
code clean up
clean up finished
merged from lp:mixxx
Merging from lp:mixxx.
Delete a ton of files that are no longer in Mixxx. Somehow they got added back via merges.
Fix the build.
Big refactoring of EngineBuffer / EngineBufferScale to support combined pitch and tempo adjustments with SoundTouch.
Don't use ST when scratching.
merge from lp:mixxx/1.11
merge from lp:mixxx/1.11
Merge with actual TRUNK lp:mixxx
Merge branch 'master' into master_sync

Conflicts:
	mixxx/src/engine/bpmcontrol.cpp
	mixxx/src/mixxx.cpp
Merge branch 'master' into master_sync-skin
Merge branch 'master_sync-skin' into master_sync

Conflicts:
	mixxx/res/skins/LateNight1280x800-WXGA/background1280x800.png