diff --git a/BLACKLIST.txt b/BLACKLIST.txt deleted file mode 100644 index 59aa3651b..000000000 --- a/BLACKLIST.txt +++ /dev/null @@ -1,3 +0,0 @@ -3D Robotics -They sell the Iris+ with a modified version of OpenTX which doesn't fullfil the GPL requirements. -No donations, no thanks, we are just free staff for them... diff --git a/companion/src/companion.qrc b/companion/src/companion.qrc index c31939f85..883c557c5 100644 --- a/companion/src/companion.qrc +++ b/companion/src/companion.qrc @@ -4,7 +4,7 @@ icon.png ../../CREDITS.txt ../../DONATIONS.txt - ../../BLACKLIST.txt + ../releasenotes.txt images/9xdb.png images/9xdl.png diff --git a/companion/src/contributorsdialog.cpp b/companion/src/contributorsdialog.cpp index 9d7e45fac..66c798817 100644 --- a/companion/src/contributorsdialog.cpp +++ b/companion/src/contributorsdialog.cpp @@ -63,12 +63,15 @@ ContributorsDialog::ContributorsDialog(QWidget * parent): " " + tr("Honors go to Rafal Tomczak (RadioClone), Thomas Husterer (th9x) and Erez Raviv (er9x and eePe)") + "
" \ ""); +#if 0 QFile blacklist(":/BLACKLIST.txt"); if (blacklist.open(QIODevice::ReadOnly | QIODevice::Text)) { QStringList names; names << blacklist.readAll(); str.append(formatTable(tr("OpenTX Blacklist"), names, 1)); } +#endif + str.append(""); ui->textEditor->setHtml(str); ui->textEditor->scroll(0, 0);