sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Eric Sandall (b9393f6311e236ee709253fe01cec189e8668d8b)
- From: Eric Sandall <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (b9393f6311e236ee709253fe01cec189e8668d8b)
- Date: Sun, 18 Jul 2010 16:59:03 -0500
GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:
kde4-apps/ktorrent4/CONFLICTS | 2 +-
kde4-apps/ktorrent4/HISTORY | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit b9393f6311e236ee709253fe01cec189e8668d8b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
ktorent4: Auto-conflict with self for upgrade path
diff --git a/kde4-apps/ktorrent4/CONFLICTS b/kde4-apps/ktorrent4/CONFLICTS
index a578f8c..b66867b 100755
--- a/kde4-apps/ktorrent4/CONFLICTS
+++ b/kde4-apps/ktorrent4/CONFLICTS
@@ -1,3 +1,3 @@
if ! spell_ok libktorrent;then
- conflicts $SPELL
+ conflicts $SPELL y
fi
diff --git a/kde4-apps/ktorrent4/HISTORY b/kde4-apps/ktorrent4/HISTORY
index f902ce8..0999efc 100644
--- a/kde4-apps/ktorrent4/HISTORY
+++ b/kde4-apps/ktorrent4/HISTORY
@@ -1,3 +1,6 @@
+2010-07-18 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Auto-conflict with self for upgrade path
+
2010-07-09 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.0.2
- [SM-Commit] GIT changes to master grimoire by Eric Sandall (b9393f6311e236ee709253fe01cec189e8668d8b), Eric Sandall, 07/18/2010
Archive powered by MHonArc 2.6.24.