Vesa dfb89c8c92 Merge branch 'stable-1.1' ...

Conflicts:
	data/locale/de.qm
	data/locale/de.ts
	src/gui/FxMixerView.cpp

2014-11-17 13:25:45 +02:00

..

core

Merge branch 'stable-1.1'

2014-11-16 22:22:48 +02:00

gui

Merge branch 'stable-1.1'

2014-11-17 13:25:45 +02:00

tracks

Merge branch 'stable-1.1'

2014-11-16 15:16:40 +02:00