[Pkg-mozext-commits] [firetray] 240/399: Merge branch 'cmd-line'

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch dfsg-clean
in repository firetray.

commit dd4770a6320df98833388d981ed2f254ae77543d
Merge: f443116 16fce35
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Sun May 13 16:24:47 2012 +0200

    Merge branch 'cmd-line'
    
    Conflicts:
    	README.md

 README.md                            |    9 ++++----
 src/chrome.manifest                  |    4 ++++
 src/components/firetray-clhandler.js |   42 ++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 4 deletions(-)

diff --cc README.md
index 4cf6cbc,effd27f..2a543cf
--- a/README.md
+++ b/README.md
@@@ -19,17 -19,17 +19,18 @@@ Feature
    * start minimized to tray
    * show icon only when hidden to tray
    * mouse scroll on tray icon shows/hides
-   * Gtk themable icons
+   * GTK-themable icons
+   * customizable tray icon
    * popup menu (show/hide indivisual windows, open new windows, quit)
-   * keyboard shortcuts *(forthcoming)*
+   * adds `-showHide` option (useful for window manager's keyboard shortcuts)
+   * middle click on the tray icon activates last registered window
  
  * for mail applications:
-   * display unread messages count in tray icon
+   * display unread message count in tray icon
    * display biff in tray icon when new messages
-   * customizable tray icon for mail biff
    * include/exclude mail accounts to/from messages count
    * include/exclude folders types to/from messages count
 +  * count in sub-folders recursively
  
  Notes
  -----

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firetray.git