merge from lp:mixxx/1.11
fix bad merges
another bad merge fix
used meld to fix a lot more bad merges
merge from lp:mixxx/1.11
merge from lp:mixxx/1.11
merge from lp:mixxx/1.11 (includes xwax update)
merge from lp:mixxx/1.11 (rest of xwax fixes and updates)
Add feature to not analyze tracks above a certain length (good for podcasts)
remove more fallout from bad merge
merge from lp:mixxx/1.11
merge from lp:mixxx/1.11
apply jus' spinny anti-alias patch
merge lp:mixxx/1.11
merge from lp:mixxx/1.11
merge from lp:mixxx/1.11
Remove redundant skin entries
Edit 1366x768 skin for my color preferences
Finished customizing LateNight 1366 skin
merge from lp:mixxx/1.11
merge from lp:mixxx/1.11 -- tried to get mixxx.cpp more in line with trunk