diff options
| author | Nicolás Reynolds <fauno@parabola.nu> | 2013-07-03 10:33:32 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@parabola.nu> | 2013-07-03 10:33:32 -0300 |
| commit | 8647aee53c2f9f5458e57fe7ac212da40a555594 (patch) | |
| tree | b99a8fbc859d18a244ea5ac496083e66ffaa330d /libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch | |
| parent | 3a14409a347f3423bf2a4ab847edff625b671e20 (diff) | |
| parent | 0a5c7083d197551290bc762f4ba90210cb733a5e (diff) | |
| download | abslibre-8647aee53c2f9f5458e57fe7ac212da40a555594.tar.gz abslibre-8647aee53c2f9f5458e57fe7ac212da40a555594.tar.bz2 abslibre-8647aee53c2f9f5458e57fe7ac212da40a555594.zip | |
Merge branch 'master' of vparabola:abslibre
Conflicts:
java/not-working/java-bnd/PKGBUILD
libre/parabola-keyring/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 | 8 |
1 files changed, 4 insertions, 4 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 d89e4d1ae..f561d5d39 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 @@ -3,7 +3,7 @@ Date: Tue, 5 Jun 2012 08:57:06 +0200 Subject: Bug 756390 - Make the "Reset Firefox" feature more generic
diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js
-index 0e8ccf5..fa46c08 100644
+index 91c5c1c..2f8bd1a 100644
--- a/browser/components/migration/content/migration.js
+++ b/browser/components/migration/content/migration.js
@@ -249,7 +249,7 @@ var MigrationWizard = {
@@ -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 fa45115..1fcf3cd 100644
+index 0541ebf..f983ae4 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 b08f8ce..446ee74 100644
+index 17f5598..0b9a24a 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3747,7 +3747,7 @@ XREMain::XRE_mainRun()
+@@ -3743,7 +3743,7 @@ XREMain::XRE_mainRun()
if (gDoProfileReset) {
// Automatically migrate from the current application if we just
// reset the profile.
|