bsongis d7205c0601 Merge remote-tracking branch 'origin/next' into ...

bsongis/refactoring_firmware_interface

Conflicts:
	companion/src/fwpreferencesdialog.cpp
	companion/src/fwpreferencesdialog.h
	companion/src/fwpreferencesdialog.ui

2014-04-19 08:21:58 +02:00

..

src

Merge remote-tracking branch 'origin/next' into

2014-04-19 08:21:58 +02:00

targets

Fixes #974

2014-04-14 19:04:32 +02:00

releasenotes.txt

Release notes synced with SVN

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