[Pkg-mozext-commits] [tabmixplus] 02/03: Merge with default
David Prévot
taffit at moszumanska.debian.org
Mon Aug 4 03:32:18 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to tag 0.4.1.3
in repository tabmixplus.
commit c9074c0eb3421a4e46c5751b7b09101c6e8847ff
Merge: a079b64 7f3ecd6
Author: onemen <tabmix.onemen at gmail.com>
Date: Wed Feb 5 09:35:58 2014 +0200
Merge with default
.hgtags | 10 +-
chrome.manifest | 9 +-
chrome/content/about.xul | 1 +
chrome/content/click/click.js | 41 +-
chrome/content/links/contentLinks.js | 28 +-
chrome/content/links/removeBlankTab.js | 81 +++
chrome/content/links/removeBlankTab.xul | 8 +
chrome/content/links/setup.js | 46 +-
chrome/content/links/unknownContentType.xul | 38 --
chrome/content/links/userInterface.js | 72 ++-
chrome/content/minit/autoReload.xul | 14 +-
chrome/content/minit/minit.js | 126 +++--
chrome/content/minit/tabView.js | 10 +-
chrome/content/minit/tablib.js | 69 ++-
chrome/content/overlay/browsr.css | 30 +-
chrome/content/overlay/browsr_17.css | 17 -
chrome/content/overlay/tabContextMenu.xul | 4 +-
chrome/content/places/places.js | 15 +-
chrome/content/preferences/appearance.js | 5 +
chrome/content/preferences/appearance.xul | 3 +
chrome/content/preferences/bindings.xml | 2 +
chrome/content/preferences/events.js | 24 +-
chrome/content/preferences/events.xul | 6 +-
chrome/content/preferences/links.xul | 3 +-
chrome/content/preferences/menu.xul | 5 +-
chrome/content/preferences/mouse.js | 36 +-
chrome/content/preferences/mouse.xul | 19 +-
chrome/content/preferences/preferences.js | 22 +-
chrome/content/preferences/session.js | 2 +-
chrome/content/preferences/shortcuts.js | 60 +--
chrome/content/preferences/shortcuts.xul | 4 +-
.../preferences/subdialogs/pref-appearance.css | 30 +-
.../preferences/subdialogs/pref-appearance.js | 13 +
.../preferences/subdialogs/pref-appearance.xml | 237 +++++----
.../preferences/subdialogs/pref-appearance.xul | 10 +-
chrome/content/session/session.js | 14 +-
chrome/content/session/sessionStore.js | 29 +-
chrome/content/tab/scrollbox.xml | 40 +-
chrome/content/tab/tab.js | 555 ++++++++-------------
chrome/content/tab/tabbrowser_4.xml | 135 +++--
chrome/content/tab/tabbrowser_proxy.xml | 15 +
chrome/content/tabmix.js | 170 +++----
chrome/content/tabmix.xul | 33 +-
chrome/content/utils.js | 4 -
chrome/locale/bg-BG/pref-appearance.dtd | 5 +
chrome/locale/bg-BG/pref-tabmix.dtd | 5 +-
chrome/locale/ca/pref-appearance.dtd | 5 +
chrome/locale/ca/pref-tabmix.dtd | 3 +
chrome/locale/cs-CZ/pref-appearance.dtd | 5 +
chrome/locale/cs-CZ/pref-tabmix.dtd | 3 +
chrome/locale/da/pref-appearance.dtd | 5 +
chrome/locale/da/pref-tabmix.dtd | 3 +
chrome/locale/de/pref-appearance.dtd | 5 +
chrome/locale/de/pref-tabmix.dtd | 3 +
chrome/locale/el/pref-appearance.dtd | 5 +
chrome/locale/el/pref-tabmix.dtd | 3 +
chrome/locale/en-US/pref-appearance.dtd | 5 +
chrome/locale/en-US/pref-tabmix.dtd | 8 +-
chrome/locale/es-ES/pref-appearance.dtd | 5 +
chrome/locale/es-ES/pref-tabmix.dtd | 5 +-
chrome/locale/et-EE/pref-appearance.dtd | 5 +
chrome/locale/et-EE/pref-tabmix.dtd | 3 +
chrome/locale/fa-IR/pref-appearance.dtd | 5 +
chrome/locale/fa-IR/pref-tabmix.dtd | 3 +
chrome/locale/fr/pref-appearance.dtd | 9 +-
chrome/locale/fr/pref-tabmix.dtd | 3 +
chrome/locale/he-IL/pref-appearance.dtd | 5 +
chrome/locale/he-IL/pref-tabmix.dtd | 3 +
chrome/locale/hr-HR/pref-appearance.dtd | 5 +
chrome/locale/hr-HR/pref-tabmix.dtd | 3 +
chrome/locale/hu-HU/pref-appearance.dtd | 5 +
chrome/locale/hu-HU/pref-tabmix.dtd | 13 +-
chrome/locale/hu-HU/tabmix.dtd | 4 +-
chrome/locale/it/misc.dtd | 8 +-
chrome/locale/it/pref-appearance.dtd | 7 +-
chrome/locale/it/pref-tabmix.dtd | 19 +-
chrome/locale/it/shortcuts.dtd | 8 +-
chrome/locale/it/tabmix.dtd | 2 +-
chrome/locale/ja/misc.dtd | 4 +-
chrome/locale/ja/pref-appearance.dtd | 5 +
chrome/locale/ja/pref-tabmix.dtd | 5 +-
chrome/locale/ja/session-manager.properties | 2 +-
chrome/locale/ko-KR/pref-appearance.dtd | 5 +
chrome/locale/ko-KR/pref-tabmix.dtd | 3 +
chrome/locale/nl/pref-appearance.dtd | 7 +-
chrome/locale/nl/pref-tabmix.dtd | 9 +-
chrome/locale/pl/pref-appearance.dtd | 5 +
chrome/locale/pl/pref-tabmix.dtd | 9 +-
chrome/locale/pl/tabmix.dtd | 2 +-
chrome/locale/pt-BR/pref-appearance.dtd | 5 +
chrome/locale/pt-BR/pref-tabmix.dtd | 3 +
chrome/locale/pt-PT/pref-appearance.dtd | 5 +
chrome/locale/pt-PT/pref-tabmix.dtd | 3 +
chrome/locale/ro/pref-appearance.dtd | 7 +-
chrome/locale/ro/pref-tabmix.dtd | 9 +-
chrome/locale/ru-RU/pref-appearance.dtd | 5 +
chrome/locale/ru-RU/pref-tabmix.dtd | 3 +
chrome/locale/sk-SK/pref-appearance.dtd | 5 +
chrome/locale/sk-SK/pref-tabmix.dtd | 3 +
chrome/locale/sr/pref-appearance.dtd | 5 +
chrome/locale/sr/pref-tabmix.dtd | 3 +
chrome/locale/sv-SE/pref-appearance.dtd | 5 +
chrome/locale/sv-SE/pref-tabmix.dtd | 3 +
chrome/locale/tr/pref-appearance.dtd | 5 +
chrome/locale/tr/pref-tabmix.dtd | 3 +
chrome/locale/uk-UA/pref-appearance.dtd | 5 +
chrome/locale/uk-UA/pref-tabmix.dtd | 3 +
chrome/locale/vi/pref-appearance.dtd | 5 +
chrome/locale/vi/pref-tabmix.dtd | 3 +
chrome/locale/zh-CN/pref-appearance.dtd | 5 +
chrome/locale/zh-CN/pref-tabmix.dtd | 3 +
chrome/locale/zh-TW/pref-appearance.dtd | 5 +
chrome/locale/zh-TW/pref-tabmix.dtd | 5 +-
chrome/skin/app_version/4.0/general.css | 120 +++++
chrome/skin/app_version/4.0/linux/browser.css | 14 +-
chrome/skin/app_version/4.0/mac/browser.css | 42 +-
chrome/skin/app_version/4.0/mac/progress.css | 23 +-
chrome/skin/app_version/4.0/win/browser.css | 24 +-
chrome/skin/app_version/4.0/win/browser_xp15.css | 30 --
chrome/skin/app_version/4.0/win/browser_xp16.css | 21 -
chrome/skin/app_version/4.0/win/progress.css | 22 +-
chrome/skin/preferences.css | 9 +-
chrome/skin/tab.css | 105 +---
defaults/preferences/tabmix.js | 17 +-
install.rdf | 4 +-
modules/AutoReload.jsm | 102 +++-
modules/DynamicRules.jsm | 367 ++++++++++++++
modules/Places.jsm | 3 +-
modules/RenameTab.jsm | 5 +-
modules/Services.jsm | 88 +++-
modules/Shortcuts.jsm | 116 ++++-
modules/Slideshow.jsm | 13 +-
modules/log.jsm | 9 +-
133 files changed, 2187 insertions(+), 1387 deletions(-)
diff --cc .hgtags
index 9702051,4974eed..4184669
--- a/.hgtags
+++ b/.hgtags
@@@ -77,7 -67,12 +77,15 @@@ afa80c359096319ca0a1485c9db1bdf319b2346
21844fdee0ea7a58ca18b3b5e80895a949ffadb6 0.4.1.2pre.131013a1
35541fe3520a027b85ef8c83e43c18f81434e0fc 0.4.1.2pre.131019a1
7f45ed652be2fd217521b57d0eb1f86b340d2d3b 0.4.1.2pre.131019a2
+90e4e89a57cd4a20ce9eb346895da64d552332eb 0.4.1.2
+558e76304a1dbbeedc0fe35dd20f57b110b6f6af 0.4.1.2.01
- d7e8799c8f2620ef20c33dc5d25b39a2dd0cba2c 0.4.1.3pre.131027a3
+574959f6cc2a75fc39b751b391bc6152d075937c 0.4.1.2.02
+ d7e8799c8f2620ef20c33dc5d25b39a2dd0cba2c 0.4.1.3pre.131027a3
+ a8ef0bddc79e647626b1cccfcc07e8f0fa58e1a5 0.4.1.3pre.131110a1
+ c3fe903cc2304bcd3110f48facc915e15da5a8c0 0.4.1.3pre.131116a1
+ 8601a13f7361d42de3d54ba573d7abe371e0fb27 0.4.1.3pre.131123a1
+ b40faaa000de2a2df9fc74de6e29ae63f036bf97 0.4.1.3pre.131204a1
+ 549281385aa80d3dd1d7bda53f5beaebe2c89620 0.4.1.3pre.131209a1
+ 2026114acf0e2ee0ed59ef48caca422c41845e7f 0.4.1.3pre.131218a1
+ 5b22828149cfaf9bc0730a32b066def1b4883bb7 0.4.1.3pre.131218a2
+ 83a3fbf15cdf335591de39bb9133ed45bcc1976b 0.4.1.3pre.140204a1
diff --cc install.rdf
index bbf8f46,0a44eab..b060f58
--- a/install.rdf
+++ b/install.rdf
@@@ -18,6 -18,6 +18,6 @@@
</RDF:Description>
<RDF:Description RDF:about="rdf:#$n83In3"
NS1:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
- NS1:minVersion="11.0"
- NS1:maxVersion="25.0.*" />
+ NS1:minVersion="17.0"
- NS1:maxVersion="28.0a1" />
++ NS1:maxVersion="27.*" />
</RDF:RDF>
--
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