Andre Bernet 2bc2030f86 Merge branch 'next' into kilrah/companion_sdcard_download ...

# Conflicts:
#	companion/src/fwpreferencesdialog.cpp

2017-05-08 09:48:53 +02:00

..

src

Merge branch 'next' into kilrah/companion_sdcard_download

2017-05-08 09:48:53 +02:00

targets

Review line ending handling (#4820)

2017-04-19 10:54:43 +02:00

releasenotes.txt

Release note for 2.1.6 updated

2015-11-11 10:42:20 +01:00