Lukas W 8e8879f735 Merge stable-1.1 ...

Conflicts:
	include/ConfigManager.h
	include/MidiTime.h
	include/string_pair_drag.h
	src/gui/string_pair_drag.cpp
	src/gui/widgets/rubberband.cpp

2014-11-10 19:26:59 +01:00

..

Amplifier

Merge stable-1.1

2014-11-10 19:26:59 +01:00

audio_file_processor

Merge stable-1.1

2014-11-10 19:26:59 +01:00

BassBooster

Merge stable-1.1

2014-11-10 19:26:59 +01:00

bit_invader

Merge stable-1.1

2014-11-10 19:26:59 +01:00

carlabase

Merge stable-1.1

2014-11-10 19:26:59 +01:00

carlapatchbay

Correct the program name and site in the descriptions.

2014-11-04 22:56:50 +01:00

carlarack

Correct the program name and site in the descriptions.

2014-11-04 22:56:50 +01:00

DualFilter

Merge stable-1.1

2014-11-10 19:26:59 +01:00

dynamics_processor

Merge stable-1.1

2014-11-10 19:26:59 +01:00

flp_import

Merge stable-1.1

2014-11-10 19:26:59 +01:00

HydrogenImport

Merge remote-tracking branch 'origin/stable-1.1'

2014-09-30 22:53:24 +02:00

kicker

Merge stable-1.1

2014-11-10 19:26:59 +01:00

ladspa_browser

Merge stable-1.1

2014-11-10 19:26:59 +01:00

LadspaEffect

Merge stable-1.1

2014-11-10 19:26:59 +01:00

lb302

Merge stable-1.1

2014-11-10 19:26:59 +01:00

lb303

Merge stable-1.1

2014-11-10 19:26:59 +01:00

MidiImport

Merge stable-1.1

2014-11-10 19:26:59 +01:00

monstro

Merge stable-1.1

2014-11-10 19:26:59 +01:00

nes

Merge stable-1.1

2014-11-10 19:26:59 +01:00

opl2

Merge stable-1.1

2014-11-10 19:26:59 +01:00

organic

Merge stable-1.1

2014-11-10 19:26:59 +01:00

papu

Merge stable-1.1

2014-11-10 19:26:59 +01:00

patman

Merge stable-1.1

2014-11-10 19:26:59 +01:00

peak_controller_effect

Merge stable-1.1

2014-11-10 19:26:59 +01:00

sf2_player

Merge stable-1.1

2014-11-10 19:26:59 +01:00

sfxr

Merge stable-1.1

2014-11-10 19:26:59 +01:00

sid

Merge stable-1.1

2014-11-10 19:26:59 +01:00

SpectrumAnalyzer

Merge stable-1.1

2014-11-10 19:26:59 +01:00

stereo_enhancer

Merge stable-1.1

2014-11-10 19:26:59 +01:00

stereo_matrix

Merge stable-1.1

2014-11-10 19:26:59 +01:00

stk

Merge stable-1.1

2014-11-10 19:26:59 +01:00

triple_oscillator

Merge stable-1.1

2014-11-10 19:26:59 +01:00

vestige

Merge stable-1.1

2014-11-10 19:26:59 +01:00

vibed

Merge stable-1.1

2014-11-10 19:26:59 +01:00

vst_base

Merge stable-1.1

2014-11-10 19:26:59 +01:00

VstEffect

Merge stable-1.1

2014-11-10 19:26:59 +01:00

watsyn

Merge stable-1.1

2014-11-10 19:26:59 +01:00

waveshaper

Merge stable-1.1

2014-11-10 19:26:59 +01:00

zynaddsubfx

Merge stable-1.1

2014-11-10 19:26:59 +01:00

CMakeLists.txt

MidiImport: fixed plugin folder name

2014-09-30 22:50:38 +02:00