Fix vamp-plugins SConscript to add the INTERNAL_VAMP_PATH to the include path correctly.
Push launchpad to github migration scripts.  WARNING very site-specific -- not usable without hand-editing
Fix return type in TwoWayMessagePipe.
Check for NULL before TrackPointer deref.
Make per-branch build directories and sconsign-files. This saves build results and signatures for different branches in different folders. This drastically reduces the need to rebuild the world when switching between branches in git.
Merging from lp:mixxx/1.11.
Backport Owen's git support changes to the build system. lp:mixxx r3379,3381-3384.
Cherry-pick lp:mixxx r3398 to get the last of Owen's git migration changes.
Merging from lp:mixxx/1.11
Fix default tooltip settings, when mixxx.cfg is empty, fixes Bug #1189337
Refactoring to make use of m_toolTipCfg clear
Fix broken Deere1280x800-WXGA skin, fixes lp:1187090

Some image files where lost, probably when merging with bpmdelegate
branch , see https://bugs.launchpad.net/mixxx/+bug/1187090
Fix spacing in some skin.xml
Add proper Modplug icon to Preferences window. This patch also adds the icon in the style of OpenMPT to the Mixxx icon template.
Remove executable bit for some icons in res/images/preferences
Merge pull request #13 from esbrandt/lp1187090

Fix broken Deere1280x800-WXGA skin, fixes lp:1187090
Merge pull request #14 from esbrandt/modplug_icon

Add proper Modplug icon to Preferences window
Delete mixxx-win32lib-msvc.
Cherry-pick .gitignore from master_sync and add some Mixxx-specific folders.
Add emacs lock-files to .gitignore.