Kjell Kernen 8059daccaf Merge branch 'origin/next' ...

Conflicts:
	companion/src/CMakeLists.txt
	companion/src/apppreferencesdialog.ui
	companion/src/companion.qrc
	companion/src/mdichild.cpp

2014-03-31 10:22:23 +02:00

..

src

Merge branch 'origin/next'

2014-03-31 10:22:23 +02:00

targets

Companion now appears in Add/Remove Programs on Windows (Forgot msys script)

2014-03-16 10:04:09 +01:00

releasenotes.txt

Release notes synced with SVN

2014-03-20 22:10:53 +01:00