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

Conflicts:
	src/core/main.cpp
	src/gui/MainWindow.cpp

2014-11-02 07:46:32 +02:00

..

core

Merge branch 'stable-1.1'

2014-11-02 07:46:32 +02:00

gui

Merge branch 'stable-1.1'

2014-11-02 07:46:32 +02:00

tracks

Rename ConfigManager files (2)

2014-11-02 01:08:27 +01:00