diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-11-22 13:03:18 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-11-22 13:03:18 -0300 |
| commit | ba0b8906199404b7b00cfeac91bff3036b8692e8 (patch) | |
| tree | 77d6dbaf822d1a66046f76c6698ec9d0f61a9bcd /libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch | |
| parent | adc549e8519824da803230cee62bfd7d808df989 (diff) | |
| parent | f97ff910471fb3ae2c8ea69befecaae8cbf6dbea (diff) | |
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Diffstat (limited to 'libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch')
| -rwxr-xr-x | libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch | 4 |
1 files changed, 2 insertions, 2 deletions
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 a5fe02165..69fe5c072 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 @@ -267,10 +267,10 @@ index f35c227..7062886 100644 %{C++
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 60348b5..c240c4f 100644
+index 68a52e6..02bb30e 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3651,7 +3651,7 @@ XREMain::XRE_mainRun()
+@@ -3669,7 +3669,7 @@ XREMain::XRE_mainRun()
if (gDoProfileReset) {
// Automatically migrate from the current application if we just
// reset the profile.
|