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

Skipped the chinese translation files because of merge conflict, those should be re-submitted for master

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

2014-08-19 09:10:19 +03:00

..

core

Merge branch 'stable-1.1'

2014-08-19 09:10:19 +03:00

gui

Added initial Qt5 support

2014-08-14 17:34:49 +02:00

tracks

Merge branch 'stable-1.1'

2014-08-19 09:10:19 +03:00