From dbca85c0e81dbf4c8ecbd85fb1f97536a59d9935 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Thu, 27 Aug 2015 11:03:07 +0200
Subject: [PATCH] 3DR removed from the blacklist
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I received some excuses, and a small 1000€ donation which I shared with
Mike
---
 BLACKLIST.txt                        | 3 ---
 companion/src/companion.qrc          | 2 +-
 companion/src/contributorsdialog.cpp | 3 +++
 3 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 BLACKLIST.txt

diff --git a/BLACKLIST.txt b/BLACKLIST.txt
deleted file mode 100644
index 59aa3651b..000000000
--- a/BLACKLIST.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-<a href="http://3drobotics.com">3D Robotics</a>
-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 @@
     <file>icon.png</file>
     <file>../../CREDITS.txt</file>
     <file>../../DONATIONS.txt</file>
-    <file>../../BLACKLIST.txt</file>
+    <!-- <file>../../BLACKLIST.txt</file> -->
     <file>../releasenotes.txt</file>
     <file>images/9xdb.png</file>
     <file>images/9xdl.png</file>
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><td class=\"normal\">" + tr("Honors go to Rafal Tomczak (RadioClone), Thomas Husterer (th9x) and Erez Raviv (er9x and eePe)") + "<br/></td></tr>" \
              "</table>");
 
+#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("</body></html>");
   ui->textEditor->setHtml(str);
   ui->textEditor->scroll(0, 0);