commit 229c0e968c9b91b8f7125df6df4074862a39a879
Author: Sukhbir Singh <[email protected]>
Date: Wed Jul 13 15:42:37 2016 -0400
Rebase jar.mn patches
---
projects/instantbird/aboutDialog-jar.patch | 19 +++++++++++--------
projects/instantbird/branding/jar.patch | 14 +++++++-------
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/projects/instantbird/aboutDialog-jar.patch
b/projects/instantbird/aboutDialog-jar.patch
index 91f13bf..2a1ed6d 100644
--- a/projects/instantbird/aboutDialog-jar.patch
+++ b/projects/instantbird/aboutDialog-jar.patch
@@ -1,12 +1,15 @@
diff --git a/im/content/jar.mn b/im/content/jar.mn
--- a/im/content/jar.mn
+++ b/im/content/jar.mn
-@@ -10,6 +10,8 @@
+@@ -9,8 +9,9 @@
+ % overlay chrome://mozapps/content/update/updates.xul
chrome://instantbird/content/softwareUpdateOverlay.xul
#endif
- content/instantbird/aboutDialog.css
- * content/instantbird/aboutDialog.xul
-+ content/instantbird/aboutDialog.js
-+ content/instantbird/aboutDialog-appUpdater.js
- content/instantbird/aboutPanel.xml
- content/instantbird/account.js
- content/instantbird/accounts.css
+ content/instantbird/aboutDialog.css
+-* content/instantbird/aboutDialog.xul
+- content/instantbird/aboutPanel.xml
++ content/instantbird/aboutDialog.xul
++ content/instantbird/aboutDialog.js
++ content/instantbird/aboutDialog-appUpdater.js
+ content/instantbird/account.js
+ content/instantbird/accounts.css
+ content/instantbird/accounts.js
diff --git a/projects/instantbird/branding/jar.patch
b/projects/instantbird/branding/jar.patch
index 7254d77..a9648c7 100644
--- a/projects/instantbird/branding/jar.patch
+++ b/projects/instantbird/branding/jar.patch
@@ -2,10 +2,10 @@ diff --git a/im/branding/messenger/jar.mn
b/im/branding/messenger/jar.mn
--- a/im/branding/messenger/jar.mn
+++ b/im/branding/messenger/jar.mn
@@ -8,3 +8,7 @@
- content/branding/about-footer.png (content/about-footer.png)
- content/branding/about.png (content/about.png)
- content/branding/icon64.png (content/icon64.png)
-+ content/branding/aboutDialog.css (content/aboutDialog.css)
-+ content/branding/about-logo.png (content/about-logo.png)
-+ content/branding/[email protected] (content/[email protected])
-+ content/branding/about-wordmark.png (content/about-wordmark.png)
+ content/branding/about-footer.png (content/about-footer.png)
+ content/branding/about.png (content/about.png)
+ content/branding/icon64.png (content/icon64.png)
++ content/branding/aboutDialog.css (content/aboutDialog.css)
++ content/branding/about-logo.png (content/about-logo.png)
++ content/branding/[email protected] (content/[email protected])
++ content/branding/about-wordmark.png (content/about-wordmark.png)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
