summaryrefslogtreecommitdiff
path: root/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-04-03 15:18:43 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-04-03 15:18:43 -0300
commitb18443b51521f0ba2e516ad36ca2379a0aa89b86 (patch)
treee047b48ec040d8f905563735fc596f389d7c7bd3 /libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
parent99197311df33d7f86868bb2dcc2d10b717dd4da2 (diff)
downloadabslibre-b18443b51521f0ba2e516ad36ca2379a0aa89b86.tar.gz
abslibre-b18443b51521f0ba2e516ad36ca2379a0aa89b86.tar.bz2
abslibre-b18443b51521f0ba2e516ad36ca2379a0aa89b86.zip
iceweasel-libre-20.0.1-1: updating version
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.patch12
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.