summaryrefslogtreecommitdiff
path: root/changes/feature_mergesystray
diff options
context:
space:
mode:
authorkali <kali@leap.se>2013-06-12 02:05:05 +0900
committerkali <kali@leap.se>2013-06-12 02:05:05 +0900
commit86add779c3e5f869b4bffbb482a4659db30e2cbc (patch)
treefc9053fc2af73ac8e6ca6d914f6e69d258fa127e /changes/feature_mergesystray
parent90fe21d31858f894dfec9bf37f432a7f39dd2b6f (diff)
parent029b4c2ac07fab41dbed9ab90e04e477938c3c05 (diff)
Merge remote-tracking branch 'chiiph/feature/merge_systray' into develop
Conflicts: src/leap/gui/mainwindow.py
Diffstat (limited to 'changes/feature_mergesystray')
-rw-r--r--changes/feature_mergesystray2
1 files changed, 2 insertions, 0 deletions
diff --git a/changes/feature_mergesystray b/changes/feature_mergesystray
new file mode 100644
index 00000000..6bb6819e
--- /dev/null
+++ b/changes/feature_mergesystray
@@ -0,0 +1,2 @@
+ o Only use one systray icon, repesenting the status for EIP. Closes
+ #2762 \ No newline at end of file