diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-04 16:44:12 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-04 16:44:12 +0200 |
| commit | c24d2623d795ac7ee5435b56dd6e413e3cbd2f69 (patch) | |
| tree | 36fd6f84a97f0ee7bde3592ea33176d1b98d64eb /libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch | |
| parent | d2e9c77d6881eb7ef37edf747a77f83168bbe9b7 (diff) | |
| parent | 1b6860ed7a33a22c4202348a4f42afbb5d26be09 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/celt-0.7/PKGBUILD
core/binutils/PKGBUILD
core/gcc/PKGBUILD
extra/gnome-media/PKGBUILD
extra/libgnome-media-profiles/PKGBUILD
extra/libwebp/PKGBUILD
extra/telepathy-kde-desktop-applets/PKGBUILD
extra/telepathy-kde-presence-applet/PKGBUILD
Diffstat (limited to 'libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch')
| -rw-r--r-- | libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch index b7bd659a0..4ca4fc704 100644 --- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch +++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch @@ -80,10 +80,10 @@ index 52722e9..0448444 100644 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);
diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm
-index 1f60879..fc83a99 100644
+index 401623a..4ce7a3e 100644
--- a/browser/components/migration/src/MigrationUtils.jsm
+++ b/browser/components/migration/src/MigrationUtils.jsm
-@@ -403,11 +403,6 @@ this.MigrationUtils = Object.freeze({
+@@ -404,11 +404,6 @@ this.MigrationUtils = Object.freeze({
* @see nsIStringBundle
*/
getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {
@@ -95,7 +95,7 @@ index 1f60879..fc83a99 100644 if (aReplacements === undefined)
return getMigrationBundle().GetStringFromName(aKey);
return getMigrationBundle().formatStringFromName(
-@@ -622,6 +617,17 @@ this.MigrationUtils = Object.freeze({
+@@ -623,6 +618,17 @@ this.MigrationUtils = Object.freeze({
},
/**
@@ -184,7 +184,7 @@ index 260bc29..52b32cc 100644 -64_firefox=Bookmarks Backups
+64_self=Bookmarks Backups
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
-index 96cedd3..a0f8a75 100644
+index fa45115..1fcf3cd 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -42,7 +42,7 @@ toolkit.jar:
@@ -267,10 +267,10 @@ index f35c227..7062886 100644 %{C++
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 1045665..04bd1aa 100644
+index 7665de2..4588f4a 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3698,7 +3698,7 @@ XREMain::XRE_mainRun()
+@@ -3699,7 +3699,7 @@ XREMain::XRE_mainRun()
if (gDoProfileReset) {
// Automatically migrate from the current application if we just
// reset the profile.
|