Merge http://projects.parabolagnulinux.org/abslibre

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 f59454192..b7bd659a0 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
@@ -184,10 +184,10 @@ 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 687c8d8..203d8cf 100644

+index 96cedd3..a0f8a75 100644

 --- a/toolkit/content/jar.mn

 +++ b/toolkit/content/jar.mn

-@@ -39,7 +39,7 @@ toolkit.jar:

+@@ -42,7 +42,7 @@ toolkit.jar:

  +  content/global/mozilla.xhtml               (mozilla.xhtml)

     content/global/nsDragAndDrop.js            (nsDragAndDrop.js)

     content/global/resetProfile.css            (resetProfile.css)

@@ -267,10 +267,10 @@ index f35c227..7062886 100644
  

  %{C++

 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp

-index e3dd0df..ef7bb74 100644

+index 1045665..04bd1aa 100644

 --- a/toolkit/xre/nsAppRunner.cpp

 +++ b/toolkit/xre/nsAppRunner.cpp

-@@ -3669,7 +3669,7 @@ XREMain::XRE_mainRun()

+@@ -3698,7 +3698,7 @@ XREMain::XRE_mainRun()

          if (gDoProfileReset) {

            // Automatically migrate from the current application if we just

            // reset the profile.