Update globals.h
Fix Apple/Clang compilation for fmaf()
Typo, add missing "else"
Bump version
Master kill switch for journalling, useful when closing program.
Changed default delay time to 0.5 seconds from 2.0.
reverted changes to globals.h
Added TR909-RimShot preset to Kicker
:///home/mikobuntu/lmms/presets/Kicker/RimShot4.xpf
Fixed naming of Kicker preset (RimShot to TR909-RimShot)
Merge pull request #1402 from mikobuntu/origin/stable-1.1

Added TR909-RimShot preset to Kicker Instrument. ( also reverted an old change i had made to zyn-globals.h )
Merge pull request #1392 from curlymorphic/Delay

Delay Plugin, Changed default delay time to 0.5 seconds from 2.0.
Merge pull request #1380 from softrabbit/journalling-killswitch

Master kill switch for journalling, useful when closing program.
added s postfix to knob values where applicable.
Added postfix "s" to knobs where relevant, cleaned up unintentional white space
Replaced whitespace in knob definitions, for consistancy
Merge pull request #1 from LMMS/master

Rebase from original
Merge pull request #1415 from curlymorphic/Delay

Delay, added s postfix to knob values where applicable.
Fix FX mixer race condition

Conflicts:

	src/core/FxMixer.cpp
Remove unused and unnessary +" " in all knob.setHintText calls
missed a couple of + " ", all sored now