[Pkg-mozext-commits] [tabmixplus] 08/14: Merge with default

[David Prévot]

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

taffit pushed a commit to branch debian-0.4.1.5
in repository tabmixplus.

commit 013352b91c3ebef956f0e047f5da13b73db862b1
Merge: 431401e b872b4e
Author: onemen <tabmix.onemen at gmail.com>
Date:   Tue Sep 30 16:48:24 2014 +0300

    Merge with default

 .hgtags                                     |  1 +
 chrome/content/click/click.js               |  4 +++
 chrome/content/extensions/extensions.js     |  2 +-
 chrome/content/links/userInterface.js       | 24 +++++++++--------
 chrome/content/minit/autoReload.js          | 15 ++++++++++-
 chrome/content/minit/autoReload.xul         | 11 ++------
 chrome/content/minit/tablib.js              | 40 ++++++++++-------------------
 chrome/content/overlay/browsr.css           |  4 +++
 chrome/content/preferences/appearance.js    |  2 +-
 chrome/content/session/session.js           |  2 +-
 chrome/content/session/sessionStore.js      |  3 ++-
 chrome/content/tabmix.xul                   | 26 +++++++++----------
 chrome/locale/cs-CZ/pref-tabmix.dtd         |  2 +-
 chrome/locale/fr/pref-tabmix.dtd            |  6 ++---
 chrome/locale/ru-RU/pref-tabmix.dtd         |  4 +--
 chrome/locale/zh-TW/pref-tabmix.dtd         |  8 +++---
 chrome/skin/app_version/4.0/general.css     |  6 +++++
 chrome/skin/app_version/4.0/mac/browser.css | 14 +++++++---
 modules/Services.jsm                        |  4 +++
 19 files changed, 100 insertions(+), 78 deletions(-)

diff --cc .hgtags
index d380710,2cc43e3..633ec02
--- a/.hgtags
+++ b/.hgtags
@@@ -102,7 -86,6 +102,8 @@@ fc82dea49309daf7725c4ae27a4db80d596814c
  38a2718220707b69472e9bd03a64437cb40c0d9c 0.4.1.5pre.140903a2
  a296ee80860577dbdac700b6a3711a969d983392 0.4.1.5pre.140913a2
  69f66a49d945c0d1d327aa95be5f7ccd23cdaeb1 0.4.1.5pre.140913a3
 +d133a118e1e1d7fde7e1f280a7dda47903eec828 0.4.1.5
  07f85fc6ed3f614da3d6c9ae1aea0f99209cb017 0.4.1.6pre.140920a1
  58af582696e2c6ec7c89b68b942486adb5b419d8 0.4.1.6pre.140920a3
 +ec95dd4034bb3eda6f1f0d4293787fbfb0f4bf88 0.4.1.5.1
+ f434e3078c20b1e8ff09efeb5c0ead8511242047 0.4.1.6pre.140926a1

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