Andre Bernet
006eee1411
Merge branch 'dvogonen/automatically_convert_settings_511' of https://github.com/opentx/opentx into next
...
Conflicts:
companion/src/main.cpp
2014-01-15 23:02:21 +01:00
Dvogonen
4f087a216f
Fixes #511 - Again :-)
2014-01-15 22:24:31 +01:00
Dvogonen
9fd20a87fe
Fixes #511
2014-01-15 21:54:43 +01:00
Dvogonen
20ddf27fff
Merge branch 'origin/next'
2014-01-15 21:30:05 +01:00
Dvogonen
2f67344b81
Fixes #512
2014-01-15 21:13:57 +01:00
Dvogonen
d0281da58d
The part where the old companion9x settings are automatically transferred to companion settings is done. Tested on Linux. Should work on Windows/OSX.
...
Now remains only to rename all the hundreds of seting references from companion9x to companion. This is blocked until Bertrand merges his reworked edit dialogs.
2014-01-07 02:10:50 +01:00
Andre Bernet
d65b74269b
More renaming. Just for the life of me can't get the translations to be recognised. Also, while a clean install will use the new app folders, the nsi scripts are currently configured to retrieve the install folder from registry if present. Might want to think about whether we want to remove this or not.
2014-01-05 12:13:38 +01:00
Dvogonen
7c9470a745
Merge branch 'origin/next'
2014-01-05 10:23:56 +01:00
Dvogonen
e5ad887be9
companion9x renamed Companion
2014-01-05 02:23:06 +01:00
Dvogonen
353eab083f
Fixed problem on Linux. Hopfully did not break Windows.
2014-01-05 01:28:12 +01:00
Bertrand Songis
2f8f2df3c7
Companion build on Linux
2013-12-02 18:47:43 +01:00
Andre Bernet