From 555210630659018785fdb9d2318081a76b49fb4c Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Thu, 31 Jan 2013 05:26:18 +0900
Subject: actually merge the release/v0.2.0 branch!

My life has been a lie until this moment...
I had done:
git merge -s ours release/v0.2.0
to avoid deleting the debian folder...
but that left the src untouched...

Now I just rm'd the src folder and did a
git checkout release/v0.2.0 src/
... and merge happy! :)
---
 src/leap/gui/firstrun/__init__.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 src/leap/gui/firstrun/__init__.py

(limited to 'src/leap/gui/firstrun/__init__.py')

diff --git a/src/leap/gui/firstrun/__init__.py b/src/leap/gui/firstrun/__init__.py
new file mode 100644
index 00000000..2a523d6a
--- /dev/null
+++ b/src/leap/gui/firstrun/__init__.py
@@ -0,0 +1,28 @@
+try:
+    import sip
+    sip.setapi('QString', 2)
+    sip.setapi('QVariant', 2)
+except ValueError:
+    pass
+
+import intro
+import connect
+import last
+import login
+import mixins
+import providerinfo
+import providerselect
+import providersetup
+import register
+
+__all__ = [
+    'intro',
+    'connect',
+    'last',
+    'login',
+    'mixins',
+    'providerinfo',
+    'providerselect',
+    'providersetup',
+    'register',
+    ]  # ,'wizard']
-- 
cgit v1.2.3