Merge remote-tracking branch 'mixxx/master'
Use the track speed, not the sample-rate adjusted value when updating indicators.
Merge remote-tracking branch 'mixxx/master' into master_sync
Merge branch 'master' into master_sync
Apply button in Property editor does not close the editor window anymore. Adds an additional OK Button. Fixes https://bugs.launchpad.net/mixxx/+bug/913255
Remove deprecated Q_WS_* defines that are removed in Qt5
Replaced all Q_WS_WIN -> Q_OS_WIN for Qt 5 compatibility
Update translation templates. Found 1333 source text(s) (35 new and 1298 already existing). Kept 32 obsolete entries
Merge pull request #115 from asantoni/remove-deprecated-qws-defines

Remove deprecated Q_WS_* defines that are removed in Qt5
Major refactoring and renaming to make things clearer
Use InternalClock for the internal clock
More renaming which should help. Differentiate [Master] COs, which are universal, from [Internal] COs, which are for the Internal Clock.
Fix connection slot name.
Replace all uses of double or int to represent a SyncMode with the explicit type (so we get type checking). Add validation to every access of a double-encoded SyncMode.
Use [InternalClock] instead of [Internal] to make it clear what the group is about.
Rename ControlPushButtonTest to WPushButtonTest.
Define the prober QT_XXX_LIB CPPDEFINES for the OS X build. These are copied verbatim from qt4.py and qt5.py. We should get qt4/5.py fixed for OS X building and remove our special-casing of OS X.
Merge branch 'master' into master_sync
Always update player beat_distance CO regardless of whether we are master or
not.

We might want this in the future for e.g. locking an effect to a player's beat
distance so we should keep it up to date.
Rename EngineSync::process() to EngineSync::onCallbackStart() and pass in the current sample rate.