commit 3a21106fd56415ad4537d0af953d7e29846a1a8a Author: Sukhbir Singh sukhbir@torproject.org Date: Sat Mar 19 07:50:02 2016 -0400

Rebase fix-mingw-build.patch --- projects/instantbird/fix-mingw-build.patch | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/projects/instantbird/fix-mingw-build.patch b/projects/instantbird/fix-mingw-build.patch index 26359f4..3f03c5b 100644 --- a/projects/instantbird/fix-mingw-build.patch +++ b/projects/instantbird/fix-mingw-build.patch @@ -1,8 +1,7 @@ diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in -index 0376e05c74a5..70c1a6ada34c 100644 --- a/im/installer/package-manifest.in +++ b/im/installer/package-manifest.in -@@ -123,6 +123,8 @@ +@@ -104,6 +104,8 @@ #endif

#endif # MOZ_ANGLE_RENDERER @@ -11,11 +10,11 @@ index 0376e05c74a5..70c1a6ada34c 100644 #ifndef MOZ_NATIVE_ICU #ifdef MOZ_SHARED_ICU #ifdef XP_WIN -@@ -140,6 +142,7 @@ +@@ -121,6 +123,7 @@ #endif #endif #endif +#endif

- ; Modules - @RESPATH@/modules/* + @RESPATH@/components/PACGenerator.js + @RESPATH@/components/PACGenerator.manifest