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

..

am_active.png

New instrument... Codename: Monstro. May be subject to a rename later.

2014-03-29 23:01:44 +02:00

am_inactive.png

New instrument... Codename: Monstro. May be subject to a rename later.

2014-03-29 23:01:44 +02:00

artwork_mat.png

Graphics updates

2014-06-17 12:39:52 +03:00

artwork_op.png

Monstro changes

2014-04-24 13:31:51 +03:00

CMakeLists.txt

New instrument... Codename: Monstro. May be subject to a rename later.

2014-03-29 23:01:44 +02:00

exp.png

Monstro waveform icons updated

2014-06-24 20:27:25 +03:00

fm_active.png

New instrument... Codename: Monstro. May be subject to a rename later.

2014-03-29 23:01:44 +02:00

fm_inactive.png

New instrument... Codename: Monstro. May be subject to a rename later.

2014-03-29 23:01:44 +02:00

logo.png

Graphics updates

2014-06-17 12:39:52 +03:00

matview_active.png

New instrument... Codename: Monstro. May be subject to a rename later.

2014-03-29 23:01:44 +02:00

matview_inactive.png

New instrument... Codename: Monstro. May be subject to a rename later.

2014-03-29 23:01:44 +02:00

mix_active.png

New instrument... Codename: Monstro. May be subject to a rename later.

2014-03-29 23:01:44 +02:00

mix_inactive.png

New instrument... Codename: Monstro. May be subject to a rename later.

2014-03-29 23:01:44 +02:00

Monstro.cpp

Merge stable-1.1

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

Monstro.h

Correct the program name and site in the descriptions.

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

moog.png

Monstro waveform icons updated

2014-06-24 20:27:25 +03:00

noise.png

Monstro waveform icons updated

2014-06-24 20:27:25 +03:00

opview_active.png

New instrument... Codename: Monstro. May be subject to a rename later.

2014-03-29 23:01:44 +02:00

opview_inactive.png

New instrument... Codename: Monstro. May be subject to a rename later.

2014-03-29 23:01:44 +02:00

pm_active.png

New instrument... Codename: Monstro. May be subject to a rename later.

2014-03-29 23:01:44 +02:00

pm_inactive.png

New instrument... Codename: Monstro. May be subject to a rename later.

2014-03-29 23:01:44 +02:00

ramp.png

Monstro waveform icons updated

2014-06-24 20:27:25 +03:00

rand.png

Monstro waveform icons updated

2014-06-24 20:27:25 +03:00

saw.png

Monstro waveform icons updated

2014-06-24 20:27:25 +03:00

sin.png

Monstro waveform icons updated

2014-06-24 20:27:25 +03:00

sinabs.png

Monstro waveform icons updated

2014-06-24 20:27:25 +03:00

sqr.png

Monstro waveform icons updated

2014-06-24 20:27:25 +03:00

sqrsoft.png

Monstro waveform icons updated

2014-06-24 20:27:25 +03:00

tinyled_off.png

Monstro: add sync mechanism, make LFOs running, fix remaining small bugs

2014-03-31 01:37:38 +03:00

tinyled_on.png

Monstro: add sync mechanism, make LFOs running, fix remaining small bugs

2014-03-31 01:37:38 +03:00

tri.png

Monstro waveform icons updated

2014-06-24 20:27:25 +03:00