From b09b1d60e80ef66c0817fcc7466a20ec5a365520 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 21 Oct 2012 14:25:29 -0200 Subject: xulrunner-libre-16.0.1.1-1: updating version --- ...0-Make-the-Reset-Firefox-feature-more-gener.patch | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch') diff --git a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch index 240c3d4e8..a5fe02165 100755 --- a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch +++ b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch @@ -139,7 +139,7 @@ index 21cf405..f3c1a6b 100644 diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties -index ab82d85..915f6b8 100644 +index 260bc29..52b32cc 100644 --- a/browser/locales/en-US/chrome/browser/migration/migration.properties +++ b/browser/locales/en-US/chrome/browser/migration/migration.properties @@ -8,7 +8,6 @@ profileName_format=%S %S @@ -150,7 +150,7 @@ index ab82d85..915f6b8 100644 importedBookmarksFolder=From %S -@@ -22,22 +21,22 @@ importedSafariReadingList=Reading List (From Safari) +@@ -24,22 +23,22 @@ importedSafariReadingList=Reading List (From Safari) 2_ie=Cookies 2_safari=Cookies 2_chrome=Cookies @@ -177,25 +177,25 @@ index ab82d85..915f6b8 100644 32_ie=Favorites 32_safari=Bookmarks -@@ -46,4 +45,4 @@ importedSafariReadingList=Reading List (From Safari) +@@ -48,4 +47,4 @@ importedSafariReadingList=Reading List (From Safari) 64_ie=Other Data 64_safari=Other Data 64_chrome=Other Data -64_firefox=Bookmarks Backups +64_self=Bookmarks Backups diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn -index 697b217..b6e1709 100644 +index 339ffda..6999b26 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -38,7 +38,7 @@ toolkit.jar: + content/global/mozilla.xhtml (mozilla.xhtml) - *+ content/global/nsDragAndDrop.js (nsDragAndDrop.js) + content/global/nsDragAndDrop.js (nsDragAndDrop.js) content/global/resetProfile.css (resetProfile.css) -* content/global/resetProfile.js (resetProfile.js) + content/global/resetProfile.js (resetProfile.js) - * content/global/resetProfile.xul (resetProfile.xul) - * content/global/resetProfileProgress.xul (resetProfileProgress.xul) - * content/global/treeUtils.js (treeUtils.js) + content/global/resetProfile.xul (resetProfile.xul) + content/global/resetProfileProgress.xul (resetProfileProgress.xul) + content/global/treeUtils.js (treeUtils.js) diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js index dcb4065..09c1146 100644 --- a/toolkit/content/resetProfile.js @@ -267,10 +267,10 @@ index f35c227..7062886 100644 %{C++ diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp -index e5d3042..6de3390 100644 +index 60348b5..c240c4f 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -3650,7 +3650,7 @@ XREMain::XRE_mainRun() +@@ -3651,7 +3651,7 @@ XREMain::XRE_mainRun() if (gDoProfileReset) { // Automatically migrate from the current application if we just // reset the profile. -- cgit v1.2.3-54-g00ecf