summaryrefslogtreecommitdiff
path: root/changes/feature_osx-eip-scripts
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-06-13 10:52:26 -0300
committerTomás Touceda <chiiph@leap.se>2013-06-13 10:52:26 -0300
commit35291c130f749850753e89d889a121ec098c0dc9 (patch)
tree59305982261bdcca659b45bafdd4c97597ac17ee /changes/feature_osx-eip-scripts
parentf35506e9b93cf0182af37ccdcc36e343b44b882c (diff)
parentcd11784b8fdf0cb45783e8d6a8e9b5288f34820d (diff)
Merge remote-tracking branch 'kali/feature/osx-eip-scripts_rev1' into develop
Conflicts: src/leap/gui/mainwindow.py
Diffstat (limited to 'changes/feature_osx-eip-scripts')
-rw-r--r--changes/feature_osx-eip-scripts3
1 files changed, 3 insertions, 0 deletions
diff --git a/changes/feature_osx-eip-scripts b/changes/feature_osx-eip-scripts
new file mode 100644
index 00000000..2b418291
--- /dev/null
+++ b/changes/feature_osx-eip-scripts
@@ -0,0 +1,3 @@
+ o OSX: Add dialog with suggestion to install up/down scripts if these not found.
+ Closes: #1264, #2759, #2249
+ o Workaround for pyside breaking with multiple inheritance. Closes #2827