piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity
3,499 Commits 2 Branches 0 Tags
d5b83e1b4ea37d6410da22a4b0a010e9743c6dde
Commit Graph
2 Commits
Author SHA1 Message Date
Kjell Kernen 58d8a99511 Merge branch 'origin/next' 
Conflicts:
	companion/src/eeprominterface.cpp
	companion/src/firmwares/opentx/opentxinterface.cpp
	companion/src/mainwindow.cpp
	companion/src/simulatordialog.cpp
	companion/src/xsimulatordialog.cpp
 2014-02-20 21:37:51 +01:00
Bertrand Songis e0a03f6728 Simu renamed to simulator, in the same directory as companion 2014-02-20 12:11:10 +01:00