possibly wrong fix for locking issue, remove script since it always changes
Unlock m_proxiesLock while deleting/creating VinylControlProxy. Prevents a deadlock caused by CO/COT collapse when reloading VC config.
Remove another bzr-specific call in the Ubuntu package build rule
Need to create output dir when building on git
Support non-vcs builds
Return empty string for unknown (assumed tarball) package
Merge branch 'master' into DJO-hacks-trunk-nodejerk
Add a preference option for the order that tracks will be loaded in 4-deck skins, since controllers vary
Merge branch 'DJO-hacks-trunk-nodejerk' into DJO-mastersync

Conflicts:
	mixxx/src/vinylcontrol/vinylcontrolmanager.cpp
Merge branch '4deck_loadorder' into DJO-mastersync

Conflicts:
	mixxx/res/skins/LateNight1920x1080-4Deck-WXGA/skin.xml
	mixxx/res/skins/LateNight1920x1080/skin.xml
	mixxx/src/engine/bpmcontrol.cpp