piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'origin/next'

Browse Source 
Conflicts:
	companion/src/apppreferencesdialog.cpp
	companion/src/apppreferencesdialog.h
	companion/src/apppreferencesdialog.ui
	companion/src/fwpreferencesdialog.ui
	companion/src/imgpreferences.ui
	companion/src/mainwindow.cpp
This commit is contained in:
Kjell Kernen
2014-02-06 18:15:12 +01:00
parent 7b8a7ffd58 dac51367f4
commit 9badcb3513
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DONATIONS.txt
+1
View File
@@ -315,3 +315,4 @@ James Kaufman
Henry Deucker
Christian Fuchs
Arold Reinders
Robert Miller