sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Thomas Orgis (0d44404872ce847fe45446cea8be78b5ebafd872)
- From: Thomas Orgis <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (0d44404872ce847fe45446cea8be78b5ebafd872)
- Date: Sat, 10 Dec 2016 15:53:09 +0000
GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:
http/firefox/CONFLICTS | 2 +-
http/firefox/HISTORY | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 0d44404872ce847fe45446cea8be78b5ebafd872
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
firefox: conflict with firefox-esr, as intended
diff --git a/http/firefox/CONFLICTS b/http/firefox/CONFLICTS
index db109b6..62bf054 100755
--- a/http/firefox/CONFLICTS
+++ b/http/firefox/CONFLICTS
@@ -1 +1 @@
-conflicts firefox
+conflicts firefox-esr
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 4da24dd..7ac1014 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2016-12-10 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFLICTS: firefox-esr, not itself!
+
2016-11-30 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 50.0.2, SECURITY_PATCH++, (CVE-2016-9079)
- [SM-Commit] GIT changes to master grimoire by Thomas Orgis (0d44404872ce847fe45446cea8be78b5ebafd872), Thomas Orgis, 12/10/2016
Archive powered by MHonArc 2.6.24.