Correct <title> in skin.xml
Merge from lp:mixxx/1.11
Remove obsolete <MarkerColor> from LateNight1280x800-4Deck-WXGA/skin.xml
Use current Sampler 2&3 row to control Deck 3&4. This make 4 regular decks & 2 sampler decks
Match waveform & text color for Deck 1+3 & Deck 2+4
merge from lp:mixxx/1.11
Merge from lp:/mixxx/1.11
merge from lp:mixxx/1.11
fix compilation issue
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.