Bertrand Songis e7dc6644c7 Merge remote-tracking branch 'origin/dvogonen/rename_companion_485' into next ...

Conflicts:
	companion/src/CMakeLists.txt
	companion/src/main.cpp
	companion/src/modeledit.cpp
	companion/src/xsimulatordialog.cpp

2014-01-15 16:09:17 +01:00

..

src

Merge remote-tracking branch 'origin/dvogonen/rename_companion_485' into next

2014-01-15 16:09:17 +01:00

targets

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

releasenotes.txt

Companion build on Linux

2013-12-02 18:47:43 +01:00