Bug #1197631 fixed - Track properties box expanding badly
TrackInfo bug - Remove spacer
Merge branch 'master' of https://github.com/mixxxdj/mixxx
trackInfo - revert height size
Merge branch 'master' of https://github.com/mixxxdj/mixxx
Clean up isScratching logic a bit.  untested.
Merge branch 'master' of https://github.com/mixxxdj/mixxx
dlgtrackinfo: add sizepolicy in all fields
Merge remote-tracking branch 'origin/master' into ratecontrol-scratchfix
add override for new scratch2 behavior
flipped a bool
Merge branch 'master' into ratecontrol-scratchfix
Rename "isScratching" to be more accurate, which is that it reports that scratching is occurring.
Fix logic in calculateRate for circumstances where we use the scratch value but don't report it.
remove script hacks that disable keylock during scratching.
(There is some whitespace churn because of my text editor)
Remove manual keylock disabling from controllerengine braking macro.
renamed m_pScratchToggle to  m_pScratchEnable
Inverse  "scratch2_always_on" logic to "scratch2_scratching"
Disable parts of rate logic during waveform scratch
Merge pull request #3 from daschuer/ratecontrol-scratchfix

Ratecontrol scratchfix VC logic
Merge branch 'master' into ratecontrol-scratchfix