sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (4bbae5df4e90372877a7ceb0745020127d3702a9)

From: Ismael Luceno <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (4bbae5df4e90372877a7ceb0745020127d3702a9)
Date: Sun, 3 Apr 2022 21:08:05 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

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

New commits:
commit 4bbae5df4e90372877a7ceb0745020127d3702a9
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

iotop: Add conflict with iotop-c

diff --git a/utils/iotop/CONFLICTS b/utils/iotop/CONFLICTS
new file mode 100755
index 0000000..3b44115
--- /dev/null
+++ b/utils/iotop/CONFLICTS
@@ -0,0 +1 @@
+conflicts iotop-c
diff --git a/utils/iotop/HISTORY b/utils/iotop/HISTORY
index 9094991..2a1a2ed 100644
--- a/utils/iotop/HISTORY
+++ b/utils/iotop/HISTORY
@@ -1,3 +1,6 @@
+2022-04-03 Ismael Luceno <ismael AT sourcemage.org>
+ * CONFLICTS: added conflict with iotop-c
+
2014-10-29 Ismael Luceno <ismael AT sourcemage.org>
* PREPARE: Don't abort on unmet run-time dependency on kernel
configuration, doesn't hamper build.

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (4bbae5df4e90372877a7ceb0745020127d3702a9), Ismael Luceno, 04/03/2022