sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Thomas Orgis (d555e13711c9f03ed755401c38078d70099002db)

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 (d555e13711c9f03ed755401c38078d70099002db)
Date: Tue, 24 Mar 2015 09:16:18 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

archive/xz-utils/CONFLICTS | 1 -
archive/xz-utils/HISTORY | 3 +++
2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit d555e13711c9f03ed755401c38078d70099002db
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

xz-utils: no conflict with lzip

diff --git a/archive/xz-utils/CONFLICTS b/archive/xz-utils/CONFLICTS
index 98f127b..2040ae7 100755
--- a/archive/xz-utils/CONFLICTS
+++ b/archive/xz-utils/CONFLICTS
@@ -1,2 +1 @@
conflicts lzma-utils
-conflicts lzip
diff --git a/archive/xz-utils/HISTORY b/archive/xz-utils/HISTORY
index 3ecdaf5..b71a5b8 100644
--- a/archive/xz-utils/HISTORY
+++ b/archive/xz-utils/HISTORY
@@ -1,3 +1,6 @@
+2015-03-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFLICTS: There is no conflict with lzip.
+
2015-03-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.2.1

[SM-Commit] GIT changes to master grimoire by Thomas Orgis (d555e13711c9f03ed755401c38078d70099002db), Thomas Orgis, 03/24/2015