Lukas W 5f4cdac802 Merge branch 'master' into rename ...

Conflicts:
	src/core/Song.cpp
	src/gui/LfoControllerDialog.cpp
	src/tracks/InstrumentTrack.cpp

2014-11-26 11:45:55 +01:00

..

Amplifier

Merge branch 'master' into rename

2014-11-26 11:45:55 +01:00

audio_file_processor

…

BassBooster

Merge branch 'master' into rename

2014-11-26 11:45:55 +01:00

bit_invader

…

carlabase

…

carlapatchbay

…

carlarack

…

delay

…

DualFilter

Merge branch 'master' into rename

2014-11-26 11:45:55 +01:00

dynamics_processor

Merge branch 'master' into rename

2014-11-26 11:45:55 +01:00

flp_import

…

GigPlayer

…

HydrogenImport

…

kicker

Merge branch 'master' into rename

2014-11-26 11:45:55 +01:00

ladspa_browser

…

LadspaEffect

…

lb302

Merge branch 'master' into rename

2014-11-26 11:45:55 +01:00

lb303

Merge branch 'master' into rename

2014-11-26 11:45:55 +01:00

MidiImport

Merge branch 'master' into rename

2014-11-26 11:45:55 +01:00

monstro

Merge branch 'master' into rename

2014-11-26 11:45:55 +01:00

nes

…

opl2

…

organic

…

papu

…

patman

…

peak_controller_effect

Merge branch 'master' into rename

2014-11-26 11:45:55 +01:00

sf2_player

Merge branch 'master' into rename

2014-11-26 11:45:55 +01:00

sfxr

…

sid

…

SpectrumAnalyzer

Merge branch 'master' into rename

2014-11-26 11:45:55 +01:00

stereo_enhancer

Merge branch 'master' into rename

2014-11-26 11:45:55 +01:00

stereo_matrix

Merge branch 'master' into rename

2014-11-26 11:45:55 +01:00

stk

Merge branch 'master' into rename

2014-11-26 11:45:55 +01:00

triple_oscillator

…

vestige

Merge branch 'master' into rename

2014-11-26 11:45:55 +01:00

vibed

…

vst_base

…

VstEffect

Merge branch 'master' into rename

2014-11-26 11:45:55 +01:00

watsyn

…

waveshaper

Merge branch 'master' into rename

2014-11-26 11:45:55 +01:00

zynaddsubfx

…

CMakeLists.txt

…