Merge branch 'release/v0.2.0'

Conflicts:
	README.txt

4 files changed, 0 insertions, 42 deletions

diff --git a/setup/linux/leap.desktop b/setup/linux/leap.desktop
deleted file mode 100644
index 7a6d39d9..00000000
--- a/setup/linux/leap.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=0.1.0
-Encoding=UTF-8
-Name=EIP
-Comment=Anonymity and privacy
-Comment[en]=Anonymity and privacy
-Comment[es]=Anonimato y privacidad
-Comment[sv]=Anonymitet och avlyssningsskydd
-Exec=leap
-Terminal=false
-Type=Application
-Icon=leap.png
-Categories=Network;
diff --git a/setup/linux/polkit/net.openvpn.gui.leap.policy b/setup/linux/polkit/net.openvpn.gui.leap.policy
deleted file mode 100644
index 70a22b65..00000000
--- a/setup/linux/polkit/net.openvpn.gui.leap.policy
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
-<policyconfig>
-
-  <vendor>LEAP Project</vendor>
-  <vendor_url>http://leap.se/</vendor_url>
-
-  <action id="net.openvpn,gui.leap.run-openvpn">
-    <description>Runs the openvpn binary</description>
-    <description xml:lang="es">Ejecuta el binario openvpn</description>
-    <message>OpenVPN needs that you authenticate to start</message>
-    <message xml:lang="es">OpenVPN necesita autorizacion para comenzar</message>
-    <icon_name>package-x-generic</icon_name> 
-    <defaults>
-      <allow_any>auth_self_keep</allow_any>
-      <allow_inactive>auth_self_keep</allow_inactive>
-      <allow_active>auth_self_keep</allow_active>
-    </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/openvpn</annotate>
-  </action>
-</policyconfig>
diff --git a/setup/requirements.pip b/setup/requirements.pip
deleted file mode 100644
index e69de29b..00000000
--- a/setup/requirements.pip
+++ /dev/null
diff --git a/setup/scripts/leap b/setup/scripts/leap
deleted file mode 100755
index 6e62b597..00000000
--- a/setup/scripts/leap
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env python
-
-from leap.app import main
-
-if __name__ == "__main__":
-    main()