[Pkg-mozext-commits] [tabmixplus] 34/44: Merge with default
David Prévot
taffit at moszumanska.debian.org
Fri Mar 18 20:57:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository tabmixplus.
commit 8970362cd205a7c7fcb057b89bf20313d36ee3f2
Merge: 5856f86 27e5c4b
Author: onemen <tabmix.onemen at gmail.com>
Date: Sat Mar 5 09:36:32 2016 +0200
Merge with default
.eslintrc | 58 +--
.eslintrc_mozilla | 7 +
.hgtags | 5 +
chrome/content/about.xul | 8 +-
chrome/content/changecode.js | 32 +-
chrome/content/click/click.js | 26 +-
chrome/content/content.js | 4 +-
chrome/content/extensions/extensions.js | 90 ++--
chrome/content/flst/lasttab.js | 71 ++-
chrome/content/links/setup.js | 168 ++-----
chrome/content/links/userInterface.js | 13 +-
chrome/content/minit/minit.js | 162 +++++--
chrome/content/minit/renameTab.xul | 1 -
chrome/content/minit/tabView.js | 230 +++++----
chrome/content/minit/tablib.js | 87 ++--
chrome/content/overlay/browsr.css | 5 +
chrome/content/places/places.js | 51 +-
chrome/content/preferences/appearance.js | 4 +-
chrome/content/preferences/menu.js | 2 +-
chrome/content/preferences/overlay/preferences.xml | 2 +-
.../preferences/overlay/preferencesOverlay.js | 4 +-
chrome/content/preferences/preferences.js | 40 +-
chrome/content/preferences/preferences.xul | 2 +-
chrome/content/preferences/shortcuts.js | 4 +-
chrome/content/preferences/shortcuts.xml | 16 +-
.../preferences/subdialogs/pref-appearance.js | 5 +-
.../preferences/subdialogs/pref-appearance.xml | 46 +-
chrome/content/session/promptservice.js | 9 +-
chrome/content/session/session.js | 527 ++++++++++++---------
chrome/content/session/sessionStore.js | 41 +-
chrome/content/tab/scrollbox.xml | 86 ++--
chrome/content/tab/tab.js | 197 ++++----
chrome/content/tab/tabbrowser_4.xml | 52 +-
chrome/content/tab/text.xml | 2 +-
chrome/content/tabmix.js | 108 ++---
chrome/content/tabmix.xul | 5 +-
chrome/content/utils.js | 4 +-
chrome/locale/bg-BG/session-manager.properties | 15 +
chrome/locale/bg-BG/tabmix.dtd | 2 +
chrome/locale/ca/session-manager.properties | 15 +
chrome/locale/ca/tabmix.dtd | 2 +
chrome/locale/cs-CZ/session-manager.properties | 15 +
chrome/locale/cs-CZ/tabmix.dtd | 4 +-
chrome/locale/da/session-manager.properties | 15 +
chrome/locale/da/tabmix.dtd | 2 +
chrome/locale/de/session-manager.properties | 15 +
chrome/locale/de/tabmix.dtd | 2 +
chrome/locale/el/session-manager.properties | 15 +
chrome/locale/el/tabmix.dtd | 2 +
chrome/locale/en-US/session-manager.properties | 15 +
chrome/locale/en-US/tabmix.dtd | 2 +
chrome/locale/es-ES/session-manager.properties | 15 +
chrome/locale/es-ES/tabmix.dtd | 2 +
chrome/locale/et-EE/session-manager.properties | 15 +
chrome/locale/et-EE/tabmix.dtd | 2 +
chrome/locale/fa-IR/session-manager.properties | 15 +
chrome/locale/fa-IR/tabmix.dtd | 2 +
chrome/locale/fr/session-manager.properties | 15 +
chrome/locale/fr/tabmix.dtd | 2 +
chrome/locale/he-IL/session-manager.properties | 15 +
chrome/locale/he-IL/tabmix.dtd | 2 +
chrome/locale/hr-HR/session-manager.properties | 15 +
chrome/locale/hr-HR/tabmix.dtd | 2 +
chrome/locale/hu-HU/session-manager.properties | 15 +
chrome/locale/hu-HU/tabmix.dtd | 2 +
chrome/locale/it/pref-tabmix.dtd | 4 +
chrome/locale/it/session-manager.properties | 15 +
chrome/locale/it/tabmix.dtd | 2 +
chrome/locale/ja/session-manager.properties | 15 +
chrome/locale/ja/tabmix.dtd | 2 +
chrome/locale/ko-KR/session-manager.properties | 15 +
chrome/locale/ko-KR/tabmix.dtd | 2 +
chrome/locale/nl/session-manager.properties | 15 +
chrome/locale/nl/tabmix.dtd | 2 +
chrome/locale/pl/pref-tabmix.dtd | 26 +-
chrome/locale/pl/session-manager.properties | 15 +
chrome/locale/pl/tabmix.dtd | 6 +-
chrome/locale/pt-BR/session-manager.properties | 15 +
chrome/locale/pt-BR/tabmix.dtd | 2 +
chrome/locale/pt-PT/session-manager.properties | 15 +
chrome/locale/pt-PT/tabmix.dtd | 2 +
chrome/locale/ro/session-manager.properties | 15 +
chrome/locale/ro/tabmix.dtd | 2 +
chrome/locale/ru-RU/session-manager.properties | 15 +
chrome/locale/ru-RU/tabmix.dtd | 2 +
chrome/locale/sk-SK/session-manager.properties | 15 +
chrome/locale/sk-SK/tabmix.dtd | 2 +
chrome/locale/sr/session-manager.properties | 15 +
chrome/locale/sr/tabmix.dtd | 2 +
chrome/locale/sv-SE/session-manager.properties | 15 +
chrome/locale/sv-SE/tabmix.dtd | 2 +
chrome/locale/tr/session-manager.properties | 15 +
chrome/locale/tr/tabmix.dtd | 2 +
chrome/locale/uk-UA/session-manager.properties | 15 +
chrome/locale/uk-UA/tabmix.dtd | 2 +
chrome/locale/vi/session-manager.properties | 15 +
chrome/locale/vi/tabmix.dtd | 2 +
chrome/locale/zh-CN/session-manager.properties | 15 +
chrome/locale/zh-CN/tabmix.dtd | 2 +
chrome/locale/zh-TW/session-manager.properties | 15 +
chrome/locale/zh-TW/tabmix.dtd | 2 +
chrome/skin/app_version/41.0/win/browser.css | 6 +
chrome/skin/preferences.css | 2 +-
install.rdf | 4 +-
modules/AboutNewTab.jsm | 5 +-
modules/AsyncUtils.jsm | 2 +-
modules/AutoReload.jsm | 4 +-
modules/ContentClick.jsm | 44 +-
modules/ContextMenu.jsm | 4 +-
modules/DynamicRules.jsm | 4 +-
modules/LinkNodeUtils.jsm | 4 +-
modules/MergeWindows.jsm | 8 +-
modules/Places.jsm | 28 +-
modules/RenameTab.jsm | 2 +
modules/Services.jsm | 25 +-
modules/Shortcuts.jsm | 26 +-
modules/SingleWindowModeUtils.jsm | 12 +-
modules/TabGroupsMigrator.jsm | 327 +++++++++++++
modules/Utils.jsm | 1 +
modules/extensions/AddonManager.jsm | 32 +-
modules/extensions/TabGroupsManager.jsm | 3 +-
modules/log.jsm | 13 +-
122 files changed, 2196 insertions(+), 1097 deletions(-)
diff --cc .hgtags
index 119f9a2,e0d17b6..56f4c02
--- a/.hgtags
+++ b/.hgtags
@@@ -135,4 -112,8 +135,9 @@@ bcf67a1e1e79e7c02782ffdd797de2b55984112
8fc9feb70bd613369bfc754709d3adbf0955ac55 0.4.2.0pre.151113a1
0e4a991b7117c194174286b72349aa6fe0d91cdc 0.4.2.0pre.151127a1
f85921a82b1e7b3aaacc387d9385e441363caf0c 0.4.2.0pre.151212a1
+86930dd810eb456e9975a506ca258b8bae1201d6 0.4.2.0
+ 8d6cc52256bf160c50cb97b98837c9aa4703a2d2 0.4.2.1pre.151226a1
+ 5079db3367eb0c84dc22efdaad8936b46d857caa 0.4.2.1pre.160124a1
+ 4cb555e75b8281be818000e09c7080b4d8fea6a3 0.4.2.1pre.160216a1
+ 07a1243bcc5328d15fa1c3f511676d4759a9eaad 0.4.2.1pre.160228a1
+ 2f0191004fdc98ab8887b87c17dfb214a20e8c72 0.4.2.1pre.160228a2
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git
More information about the Pkg-mozext-commits
mailing list