Tobias Doerffel eee2ba7f16 Merge remote-tracking branch 'origin/stable-1.1' ...

Conflicts:
	data/locale/de.qm
	data/locale/de.ts

2014-06-21 23:30:59 +02:00

..

core

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

2014-06-21 23:30:59 +02:00

gui

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

2014-06-21 23:30:59 +02:00

tracks

... somehow didn't notice the already existing engine::mixer()->lock() there...

2014-06-19 00:38:48 +03:00