sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Bor Kraljič (35a82e71103c1afd8a65c8b3967b376f6b17ee4b)
- From: Bor Kraljič <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Bor Kraljič (35a82e71103c1afd8a65c8b3967b376f6b17ee4b)
- Date: Thu, 8 Sep 2011 04:23:10 -0500
GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:
kde4/kdelibs4/CONFLICTS | 2 +-
kde4/kdelibs4/HISTORY | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 35a82e71103c1afd8a65c8b3967b376f6b17ee4b
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kdelibs4: conflict with yakuake and not yakuake4
diff --git a/kde4/kdelibs4/CONFLICTS b/kde4/kdelibs4/CONFLICTS
index 3df28bc..68e7659 100755
--- a/kde4/kdelibs4/CONFLICTS
+++ b/kde4/kdelibs4/CONFLICTS
@@ -94,7 +94,7 @@ conflicts kbfx y
conflicts kfiresaver3d y
conflicts polyester y
conflicts superkaramba y
-conflicts yakuake4 y
+conflicts yakuake y
conflicts libopensync-plugin-kdepim y
conflicts kst y
conflicts pgcalc2 y
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index e66508e..820dbe7 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,6 @@
+2011-09-08 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: conflict with yakuake and not yakuake4
+
2011-09-07 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.7.1
- [SM-Commit] GIT changes to master grimoire by Bor Kraljič (35a82e71103c1afd8a65c8b3967b376f6b17ee4b), Bor Kraljič, 09/08/2011
Archive powered by MHonArc 2.6.24.