[Pkg-mozext-commits] [tabmixplus] 04/05: Merge with default
David Prévot
taffit at moszumanska.debian.org
Fri Aug 28 19:09:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to tag 0.4.1.9
in repository tabmixplus.
commit f914fe28f2415cdf03a4e39d6f3cb21e52dc477d
Merge: ce50b4e d768b39
Author: onemen <tabmix.onemen at gmail.com>
Date: Wed Aug 26 09:36:28 2015 +0300
Merge with default
.hgtags | 7 +
chrome.manifest | 9 +-
chrome/content/changecode.js | 22 +-
chrome/content/click/click.js | 22 +-
chrome/content/content.js | 27 ++-
chrome/content/extensions/extensions.js | 23 +-
chrome/content/flst/lasttab.js | 5 +
chrome/content/links/contentLinks.js | 2 +-
chrome/content/links/removeBlankTab.js | 3 +-
chrome/content/links/setup.js | 10 +-
chrome/content/links/userInterface.js | 46 ++--
chrome/content/minit/minit.js | 34 ++-
chrome/content/minit/tablib.js | 115 ++++++---
chrome/content/overlay/browsr.css | 31 +++
chrome/content/overlay/tabContextMenu.xul | 4 +-
chrome/content/overlay/tabstoolbar.xul | 6 +-
chrome/content/places/bookmarkProperties.xul | 6 +-
chrome/content/places/places.js | 45 +++-
chrome/content/preferences/appearance.js | 4 +-
chrome/content/preferences/appearance.xul | 19 +-
chrome/content/preferences/events.js | 15 +-
chrome/content/preferences/events.xul | 20 +-
chrome/content/preferences/links.js | 4 +-
chrome/content/preferences/menu.xul | 2 -
chrome/content/preferences/mouse.xul | 2 -
.../preferences/overlay/incontentPreferences.xul | 2 +-
.../preferences/overlay/overlaySanitizeUI.js | 6 +-
chrome/content/preferences/preferences.js | 101 ++++----
chrome/content/preferences/preferences.xul | 3 +-
chrome/content/preferences/session.js | 2 +-
chrome/content/preferences/shortcuts.xml | 15 +-
chrome/content/session/session.js | 100 ++++----
chrome/content/session/sessionStore.js | 18 +-
chrome/content/tab/scrollbox.xml | 28 +--
chrome/content/tab/tab.js | 190 +++++++++------
chrome/content/tab/tabbrowser_4.xml | 48 ++--
chrome/content/tabmix.js | 123 ++++++----
chrome/content/tabmix.xul | 10 +-
chrome/content/utils.js | 4 +-
chrome/locale/bg-BG/pref-tabmix.dtd | 5 +-
chrome/locale/bg-BG/tabmix.properties | 10 +-
chrome/locale/ca/pref-tabmix.dtd | 5 +-
chrome/locale/ca/tabmix.properties | 8 +
chrome/locale/cs-CZ/pref-tabmix.dtd | 5 +-
chrome/locale/cs-CZ/tabmix.properties | 10 +-
chrome/locale/da/pref-tabmix.dtd | 5 +-
chrome/locale/da/tabmix.properties | 8 +
chrome/locale/de/pref-tabmix.dtd | 7 +-
chrome/locale/de/tabmix.properties | 8 +
chrome/locale/el/pref-tabmix.dtd | 5 +-
chrome/locale/el/tabmix.properties | 8 +
chrome/locale/en-US/pref-tabmix.dtd | 5 +-
chrome/locale/en-US/tabmix.properties | 8 +
chrome/locale/es-ES/pref-tabmix.dtd | 7 +-
chrome/locale/es-ES/tabmix.properties | 10 +-
chrome/locale/et-EE/pref-tabmix.dtd | 5 +-
chrome/locale/et-EE/tabmix.properties | 14 +-
chrome/locale/fa-IR/pref-tabmix.dtd | 5 +-
chrome/locale/fa-IR/tabmix.properties | 8 +
chrome/locale/fr/pref-tabmix.dtd | 5 +-
chrome/locale/fr/tabmix.properties | 10 +-
chrome/locale/he-IL/pref-tabmix.dtd | 5 +-
chrome/locale/he-IL/tabmix.properties | 8 +
chrome/locale/hr-HR/pref-tabmix.dtd | 5 +-
chrome/locale/hr-HR/tabmix.properties | 8 +
chrome/locale/hu-HU/pref-tabmix.dtd | 5 +-
chrome/locale/hu-HU/tabmix.properties | 8 +
chrome/locale/it/pref-tabmix.dtd | 9 +-
chrome/locale/it/tabmix.properties | 8 +
chrome/locale/ja/pref-tabmix.dtd | 5 +-
chrome/locale/ja/tabmix.properties | 10 +-
chrome/locale/ko-KR/pref-tabmix.dtd | 5 +-
chrome/locale/ko-KR/tabmix.properties | 8 +
chrome/locale/nl/pref-tabmix.dtd | 5 +-
chrome/locale/nl/tabmix.properties | 8 +
chrome/locale/pl/pref-tabmix.dtd | 5 +-
chrome/locale/pl/tabmix.properties | 10 +-
chrome/locale/pt-BR/pref-tabmix.dtd | 5 +-
chrome/locale/pt-BR/tabmix.properties | 8 +
chrome/locale/pt-PT/pref-tabmix.dtd | 5 +-
chrome/locale/pt-PT/tabmix.properties | 8 +
chrome/locale/ro/pref-tabmix.dtd | 5 +-
chrome/locale/ro/tabmix.properties | 10 +-
chrome/locale/ru-RU/pref-tabmix.dtd | 5 +-
chrome/locale/ru-RU/tabmix.properties | 8 +
chrome/locale/sk-SK/pref-tabmix.dtd | 5 +-
chrome/locale/sk-SK/tabmix.properties | 10 +-
chrome/locale/sr/pref-tabmix.dtd | 5 +-
chrome/locale/sr/tabmix.properties | 10 +-
chrome/locale/sv-SE/pref-tabmix.dtd | 5 +-
chrome/locale/sv-SE/tabmix.properties | 8 +
chrome/locale/tr/pref-tabmix.dtd | 5 +-
chrome/locale/tr/tabmix.properties | 8 +
chrome/locale/uk-UA/pref-tabmix.dtd | 5 +-
chrome/locale/uk-UA/tabmix.properties | 8 +
chrome/locale/vi/pref-tabmix.dtd | 5 +-
chrome/locale/vi/tabmix.properties | 8 +
chrome/locale/zh-CN/pref-tabmix.dtd | 9 +-
chrome/locale/zh-CN/tabmix.dtd | 4 +-
chrome/locale/zh-CN/tabmix.properties | 8 +
chrome/locale/zh-TW/pref-tabmix.dtd | 7 +-
chrome/locale/zh-TW/tabmix.properties | 10 +-
chrome/skin/app_version/39.0/linux/browser.css | 17 ++
chrome/skin/app_version/39.0/mac/browser.css | 35 +++
chrome/skin/app_version/39.0/tabStyles.css | 269 +++++++++++++++++++++
chrome/skin/app_version/39.0/win/browser.css | 19 ++
chrome/skin/app_version/4.0/general.css | 187 --------------
.../app_version/{4.0 => all}/linux/browser.css | 10 +-
.../skin/app_version/{4.0 => all}/mac/browser.css | 19 +-
.../skin/app_version/{4.0 => all}/mac/progress.css | 2 +-
.../skin/app_version/{4.0 => all}/win/browser.css | 11 +-
.../skin/app_version/{4.0 => all}/win/progress.css | 2 +-
.../skin/app_version/before39.0/linux/browser.css | 17 ++
chrome/skin/app_version/before39.0/mac/browser.css | 35 +++
chrome/skin/app_version/before39.0/tabStyles.css | 267 ++++++++++++++++++++
chrome/skin/app_version/before39.0/win/browser.css | 19 ++
chrome/skin/general.css | 67 +++++
chrome/skin/tab.css | 27 +--
defaults/preferences/tabmix.js | 3 +-
install.rdf | 2 +-
modules/AsyncUtils.jsm | 57 +++++
modules/AutoReload.jsm | 24 +-
modules/ContentClick.jsm | 6 +-
modules/DynamicRules.jsm | 70 +++---
modules/MergeWindows.jsm | 7 +-
modules/NewTabURL.jsm | 48 ++++
modules/Places.jsm | 11 +-
modules/Services.jsm | 52 +++-
modules/Shortcuts.jsm | 2 +-
modules/SingleWindowModeUtils.jsm | 38 ++-
modules/Utils.jsm | 12 +-
modules/extensions/TabGroupsManager.jsm | 2 +-
modules/log.jsm | 112 ++++++---
133 files changed, 2191 insertions(+), 838 deletions(-)
diff --cc .hgtags
index 2dc075f,f5aaf29..a0d2f01
--- a/.hgtags
+++ b/.hgtags
@@@ -118,7 -98,12 +118,14 @@@ 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
+ 2c09c3c371cb8ec5961779a120a39c349cb17978 0.4.1.8pre.150607a1
+ 8abf33f8e0d47e3210dc05c59e0eec5cd58fb2b5 0.4.1.8pre.150607a2
+834dd4231bd3bdaa1f1f0817ffd0dde8029dab3b 0.4.1.8
+ 882af80dc22d8a335ad93d1d544bca368a5fcd9e 0.4.1.9pre.150703a1
+ c0f3653f204e5d6f42633b2c70496fe8851d763f 0.4.1.9pre.150801a1
+ 9a66acc65f0108b057c31de9b33a463a0e09f3b3 0.4.1.9pre.150801a2
+ fa3c152344b7ff75ca855d9ad31d6e50d6c75c2d 0.4.1.9pre.150815a1
+ 14630a99562de7c4a24342ce8b5109a38f20b394 0.4.1.9pre.150819a1
diff --cc install.rdf
index bedd586,80c4560..afe8e24
--- a/install.rdf
+++ b/install.rdf
@@@ -20,8 -20,8 +20,8 @@@
</RDF:Description>
<RDF:Description RDF:about="rdf:#$n83In3"
NS1:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
- NS1:minVersion="17.0"
+ NS1:minVersion="31.0"
- NS1:maxVersion="43.0a1" />
+ NS1:maxVersion="39.*" />
<RDF:Description RDF:about="rdf:#$n74Pm2"
NS1:id="{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}"
NS1:minVersion="25.0"
--
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