Lukas W 1059c92d87 Merge branch 'stable-1.2' ...

# Conflicts:
#	.travis/linux..before_install.sh
#	.travis/linux..install.sh
#	cmake/linux/lmms.desktop
#	plugins/vst_base/CMakeLists.txt

2017-10-18 17:33:55 +02:00

..

Amplifier

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

audio_file_processor

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

BassBooster

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

bit_invader

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

Bitcrush

Merge branch 'stable-1.2' into master (@liushuyu)

2017-07-15 08:08:07 +09:00

carlabase

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

carlapatchbay

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

carlarack

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

CrossoverEQ

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

Delay

Merge branch 'stable-1.2' into master (@liushuyu)

2017-07-15 08:08:07 +09:00

DualFilter

Merge branch 'stable-1.2' into master (@liushuyu)

2017-07-15 08:08:07 +09:00

dynamics_processor

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

Eq

Merge remote-tracking branch 'upstream/stable-1.2'

2017-08-27 13:07:45 +02:00

Flanger

Merge branch 'stable-1.2' into master (@liushuyu)

2017-07-15 08:08:07 +09:00

GigPlayer

Merge branch 'stable-1.2' into master (@liushuyu)

2017-07-15 08:08:07 +09:00

HydrogenImport

Rename bbTrack, trackContentObject and friends

2014-11-26 10:53:47 +01:00

kicker

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

ladspa_browser

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

LadspaEffect

Merge branch 'stable-1.2'

2017-10-18 17:33:55 +02:00

lb302

Introduce an enum to describe the VCA mode

2017-10-01 11:51:44 +02:00

MidiExport

Fix MIDI export (#3733)

2017-09-14 08:09:54 +09:00

MidiImport

MidiImport - set tempo (#3409)

2017-03-08 01:10:07 +01:00

monstro

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

MultitapEcho

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

nes

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

opl2

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

organic

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

papu

Merge branch 'stable-1.2'

2017-10-18 17:33:55 +02:00

patman

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

peak_controller_effect

Merge pull request #3444 from LMMS/jasp00-patch-3

2017-05-02 22:20:28 -04:00

ReverbSC

Merge branch 'stable-1.2' into master (@liushuyu)

2017-07-15 08:08:07 +09:00

sf2_player

Merge branch 'stable-1.2' into master (@liushuyu)

2017-07-15 08:08:07 +09:00

sfxr

Merge branch 'stable-1.2'

2017-10-18 17:33:55 +02:00

sid

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

SpectrumAnalyzer

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

stereo_enhancer

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

stereo_matrix

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

stk

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

triple_oscillator

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

vestige

Merge branch 'stable-1.2'

2017-10-03 15:56:16 +09:00

vibed

Fix warnings (#3852)

2017-10-11 19:10:03 +02:00

vst_base

Merge branch 'stable-1.2'

2017-10-18 17:33:55 +02:00

VstEffect

Fix VST effect control icon display

2017-09-24 15:42:02 +09:00

watsyn

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

waveshaper

Use Qt's Resource System (2nd approach) (#1891)

2017-03-26 22:06:43 +02:00

xpressive

General improvements and fixes (#3772)

2017-08-23 21:09:43 +02:00

zynaddsubfx

Merge branch 'stable-1.2'

2017-10-18 17:33:55 +02:00

CMakeLists.txt

Merge branch 'stable-1.2'

2017-10-03 15:56:16 +09:00