bsongis 220e9f3e97 Merge remote-tracking branch 'origin/next' into TaranisPlus ...

Conflicts:
	companion/src/generaledit.cpp
	companion/src/generaledit.ui
	radio/src/gui/menu_general.cpp

2014-05-11 14:41:03 +02:00

..

src

Merge remote-tracking branch 'origin/next' into TaranisPlus

2014-05-11 14:41:03 +02:00

targets

Fixes #974

2014-04-14 19:04:32 +02:00

releasenotes.txt

Release notes synced with SVN

2014-03-20 22:10:53 +01:00