[Pkg-mozext-commits] [tabmixplus] 35/47: Merge with default

[David Prévot]

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

taffit pushed a commit to branch upstream
in repository tabmixplus.

commit 45bc8378b90c6657f8057833a148809220b62b32
Merge: 606b542 cf1b0d0
Author: onemen <tabmix.onemen at gmail.com>
Date:   Mon Sep 22 16:43:51 2014 +0300

    Merge with default

 .hgtags                                       |  2 +
 chrome/content/about.js                       | 19 ++++++
 chrome/content/about.xul                      | 26 +-------
 chrome/content/extensions/extensions.js       | 89 +++++----------------------
 chrome/content/links/newTab.js                | 35 +++++++++++
 chrome/content/links/newTab.xul               | 36 +----------
 chrome/content/links/userInterface.js         | 71 +++++++++++----------
 chrome/content/minit/autoReload.js            | 45 ++++++++++++++
 chrome/content/minit/autoReload.xul           | 53 +---------------
 chrome/content/minit/minit.js                 |  4 +-
 chrome/content/minit/tabView.js               |  7 ++-
 chrome/content/minit/tablib.js                | 60 ++++++++++++++----
 chrome/content/places/places.js               | 21 ++++---
 chrome/content/preferences/session.xul        |  6 ++
 chrome/content/session/sessionStore.js        | 16 +++--
 chrome/content/tab/tab.js                     |  4 +-
 chrome/content/tabmix.js                      | 12 ++--
 chrome/skin/app_version/4.0/linux/browser.css |  4 ++
 chrome/skin/app_version/4.0/mac/browser.css   |  4 ++
 chrome/skin/app_version/4.0/win/browser.css   |  1 +
 modules/extensions/TabGroupsManager.jsm       |  2 +-
 21 files changed, 263 insertions(+), 254 deletions(-)

diff --cc .hgtags
index df7c308,46be55a..b461ff5
--- a/.hgtags
+++ b/.hgtags
@@@ -102,4 -86,5 +102,6 @@@ 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

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