diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-17 17:32:01 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-17 17:32:01 -0300 |
| commit | 88e1da204a82b0e8c0fa1a9e42ecd1b86a08eab8 (patch) | |
| tree | 37421daac725a396555168b30cacc1868b02611e /libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch | |
| parent | 308f6ff034c928c0c4fc2ce168df7192ca2b1209 (diff) | |
| parent | 9e3260441a96b92953b3cfc91cf552f2d5177225 (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 c9df18dc4..82ba01a9c 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 42fbd15..6c3dbfe 100644
+index 20a3d6e..87e351d 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3737,7 +3737,7 @@ XREMain::XRE_mainRun()
+@@ -3843,7 +3843,7 @@ XREMain::XRE_mainRun()
if (gDoProfileReset) {
// Automatically migrate from the current application if we just
// reset the profile.
|