Merge branch 'stable-1.1'

Browse Source

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

...

This commit is contained in:

Vesa

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

parent cd509b707b 7c901d4dfd

commit dfb89c8c92

11 changed files with 367 additions and 284 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

data/locale/de.qm

Binary file not shown.

448

data/locale/de.ts

File diff suppressed because it is too large Load Diff