[Pkg-mozext-commits] [tabmixplus] 02/07: Merge with default

[David Prévot]

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

taffit pushed a commit to branch master
in repository tabmixplus.

commit 6e89475bb70c6529271c6798dada73cc19bfeeb3
Merge: a18bcd3 0802674
Author: onemen <tabmix.onemen at gmail.com>
Date:   Mon Jun 15 11:45:25 2015 +0300

    Merge with default

 .hgtags                                 |   2 +
 chrome/content/click/click.js           |  30 ++++-
 chrome/content/content.js               |  81 ++++++++++--
 chrome/content/extensions/extensions.js |   4 +-
 chrome/content/links/contentLinks.js    |   9 +-
 chrome/content/links/setup.js           |  12 +-
 chrome/content/minit/minit.js           |  23 ++--
 chrome/content/minit/tabView.js         |   6 +-
 chrome/content/minit/tablib.js          | 135 +++++++++++--------
 chrome/content/places/places.js         |  11 +-
 chrome/content/session/session.js       | 228 +++++++++++++++++---------------
 chrome/content/session/sessionStore.js  |  22 ++-
 chrome/content/tab/scrollbox.xml        |  34 +++++
 chrome/content/tab/tab.js               |  77 +++++------
 chrome/content/tab/tabbrowser_4.xml     |  24 ++--
 chrome/content/tabmix.js                |  30 ++---
 chrome/content/tabmix.xul               |   4 +-
 chrome/content/utils.js                 |  13 +-
 chrome/locale/bg-BG/tabmix.properties   |   1 +
 chrome/locale/ca/tabmix.properties      |   1 +
 chrome/locale/cs-CZ/tabmix.properties   |   1 +
 chrome/locale/da/tabmix.properties      |   1 +
 chrome/locale/de/tabmix.properties      |   1 +
 chrome/locale/el/tabmix.properties      |   1 +
 chrome/locale/en-US/tabmix.properties   |   1 +
 chrome/locale/es-ES/tabmix.properties   |   1 +
 chrome/locale/et-EE/tabmix.properties   |   1 +
 chrome/locale/fa-IR/tabmix.properties   |   1 +
 chrome/locale/fr/tabmix.properties      |   1 +
 chrome/locale/he-IL/tabmix.properties   |   1 +
 chrome/locale/hr-HR/tabmix.properties   |   1 +
 chrome/locale/hu-HU/pref-appearance.dtd |   2 +-
 chrome/locale/hu-HU/pref-tabmix.dtd     |   8 +-
 chrome/locale/hu-HU/shortcuts.dtd       |   2 +-
 chrome/locale/hu-HU/tabmix.properties   |   1 +
 chrome/locale/it/pref-tabmix.dtd        |   2 +
 chrome/locale/it/tabmix.properties      |   1 +
 chrome/locale/ja/tabmix.properties      |   1 +
 chrome/locale/ko-KR/tabmix.properties   |   1 +
 chrome/locale/nl/tabmix.properties      |   3 +-
 chrome/locale/pl/tabmix.properties      |   1 +
 chrome/locale/pt-BR/tabmix.properties   |   1 +
 chrome/locale/pt-PT/tabmix.properties   |   1 +
 chrome/locale/ro/tabmix.properties      |   1 +
 chrome/locale/ru-RU/pref-tabmix.dtd     |   2 +-
 chrome/locale/ru-RU/tabmix.properties   |   5 +-
 chrome/locale/sk-SK/tabmix.properties   |   1 +
 chrome/locale/sr/tabmix.properties      |   1 +
 chrome/locale/sv-SE/tabmix.properties   |   1 +
 chrome/locale/tr/tabmix.properties      |   1 +
 chrome/locale/uk-UA/tabmix.properties   |   1 +
 chrome/locale/vi/tabmix.properties      |   1 +
 chrome/locale/zh-CN/tabmix.properties   |   1 +
 chrome/locale/zh-TW/tabmix.properties   |   1 +
 modules/AutoReload.jsm                  |  95 ++++++++-----
 modules/ContentClick.jsm                | 157 +++++++++++++++-------
 modules/DocShellCapabilities.jsm        |  39 +++---
 modules/LinkNodeUtils.jsm               |   6 -
 modules/MergeWindows.jsm                |  65 +++++----
 modules/Places.jsm                      |   2 +-
 modules/Services.jsm                    |  14 --
 modules/Utils.jsm                       |  74 +++++++++++
 modules/log.jsm                         |  16 ++-
 63 files changed, 807 insertions(+), 459 deletions(-)

diff --cc .hgtags
index f8ab9ce,485158e..0e0da7c
--- a/.hgtags
+++ b/.hgtags
@@@ -118,4 -98,5 +118,6 @@@ a8293081d10d11f6a457da739ee4eba56e930d4
  061b3bbf1ca62b8a8d161145948664c443089891 0.4.1.7pre.150112a1
  897ff86e9e2e123a6d2ffb2b0768068d7b874a5a 0.4.1.7pre.150126a1
  a881b08218d188c6cb549a8fe8b8b3ac3f783fd3 0.4.1.7pre.150212a1
 +715da3814abcece4c0646a64ea92694f1100c824 0.4.1.7
+ f610b854a6cadf59c1683dff1561bd9a615b2df3 0.4.1.8pre.150303a1
+ 91a058cc0b0f193b3952386b49bebb1abac27285 0.4.1.8pre.150317a1

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