diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-03-25 12:45:40 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-03-25 12:45:40 -0300 |
| commit | 27cd560baa49d7eb685a5789cb915c5cdbdaf305 (patch) | |
| tree | 03f7fdcdfa62b05dd9793f2809c20d6357c991c0 /libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch | |
| parent | 88e1da204a82b0e8c0fa1a9e42ecd1b86a08eab8 (diff) | |
| parent | c86852f13787f259167b1df6d3762ef78980cad3 (diff) | |
Merge branch 'master' of vparabola: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 82ba01a9c..8ce9f48cc 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 20a3d6e..87e351d 100644
+index 90d6c51..c25a301 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3843,7 +3843,7 @@ XREMain::XRE_mainRun()
+@@ -3926,7 +3926,7 @@ XREMain::XRE_mainRun()
if (gDoProfileReset) {
// Automatically migrate from the current application if we just
// reset the profile.
|