sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6fdc1f45c8b0fce383fa024d79254e9cf761428d)

From: Vlad Glagolev <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6fdc1f45c8b0fce383fa024d79254e9cf761428d)
Date: Wed, 3 Oct 2018 14:17:24 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

utils/daemontools/CONFLICTS | 1 +
utils/daemontools/HISTORY | 3 +++
2 files changed, 4 insertions(+)

New commits:
commit 6fdc1f45c8b0fce383fa024d79254e9cf761428d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

daemontools: conflicts with envdir

diff --git a/utils/daemontools/CONFLICTS b/utils/daemontools/CONFLICTS
new file mode 100755
index 0000000..ba375ba
--- /dev/null
+++ b/utils/daemontools/CONFLICTS
@@ -0,0 +1 @@
+conflicts envdir
diff --git a/utils/daemontools/HISTORY b/utils/daemontools/HISTORY
index c2b079c..d85877e 100644
--- a/utils/daemontools/HISTORY
+++ b/utils/daemontools/HISTORY
@@ -1,3 +1,6 @@
+2018-10-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFLICTS: added, conflicts with envdir
+
2008-07-19 Elisamuel Resto <ryuji AT sourcemage.org>
* BUILD, CONFIGURE, DETAILS, FINAL, HISTORY, INSTALL, POST_REMOVE,
POST_RESURRECT, PRE_BUILD, daemontools-docs.tar.bz2, init.d:

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6fdc1f45c8b0fce383fa024d79254e9cf761428d), Vlad Glagolev, 10/03/2018