diff options
author | shackra <elcorreo@deshackra.com> | 2014-05-18 23:19:29 -0600 |
---|---|---|
committer | shackra <elcorreo@deshackra.com> | 2014-05-18 23:19:29 -0600 |
commit | 113793e5d19301552423a95947efc704424a7167 (patch) | |
tree | c1804e43e11d5f9a152436b42a7ce182e88d500b /libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch | |
parent | 01011325d60e0262ba0d5a51c4d3b2be57f5924c (diff) | |
parent | 1287ab2629ed3997b6ec6e603847eafb1e6aa199 (diff) | |
download | abslibre-113793e5d19301552423a95947efc704424a7167.tar.gz abslibre-113793e5d19301552423a95947efc704424a7167.tar.bz2 abslibre-113793e5d19301552423a95947efc704424a7167.zip |
Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre
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 | 4 |
1 files changed, 2 insertions, 2 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 8ce9f48cc..56de11354 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 @@ -273,10 +273,10 @@ index f35c227..7062886 100644 %{C++
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 90d6c51..c25a301 100644
+index fe66f3b..2ddcd3b 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3926,7 +3926,7 @@ XREMain::XRE_mainRun()
+@@ -3952,7 +3952,7 @@ XREMain::XRE_mainRun()
if (gDoProfileReset) {
// Automatically migrate from the current application if we just
// reset the profile.
|