sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (6f6e92771944d5af522cca54895ee243f4237747)
- From: Bor Kraljič <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (6f6e92771944d5af522cca54895ee243f4237747)
- Date: Wed, 17 Aug 2011 01:12:05 -0500
GIT changes to devel-kde47 grimoire by Bor Kraljič <pyrobor AT ver.si>:
kde4-graphics/kgamma/CONFLICTS | 2 +-
kde4-graphics/kgamma/HISTORY | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 6f6e92771944d5af522cca54895ee243f4237747
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kgamma: suggest "y" as default answer for conflicts
diff --git a/kde4-graphics/kgamma/CONFLICTS b/kde4-graphics/kgamma/CONFLICTS
index a282691..fffbb78 100755
--- a/kde4-graphics/kgamma/CONFLICTS
+++ b/kde4-graphics/kgamma/CONFLICTS
@@ -1,2 +1,2 @@
conflicts kdegraphics4 y &&
-conflicts kgamma
+conflicts kgamma y
diff --git a/kde4-graphics/kgamma/HISTORY b/kde4-graphics/kgamma/HISTORY
index 4b5e709..81667b2 100644
--- a/kde4-graphics/kgamma/HISTORY
+++ b/kde4-graphics/kgamma/HISTORY
@@ -1,4 +1,5 @@
2011-08-16 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: suggest "y" as default answer for conflicts
* DEPENDS: added missing dependency
2011-08-15 Bor Kraljič <pyrobor AT ver.si>
- [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (6f6e92771944d5af522cca54895ee243f4237747), Bor Kraljič, 08/17/2011
Archive powered by MHonArc 2.6.24.