Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (86e51bdbf6ff547ed0d44c2d4e580739396e98d5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (86e51bdbf6ff547ed0d44c2d4e580739396e98d5)
  • Date: Tue, 27 Jan 2009 17:05:29 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

kde4/kdepimlibs4/CONFLICTS | 2 +-
kde4/kdepimlibs4/HISTORY | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 86e51bdbf6ff547ed0d44c2d4e580739396e98d5
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

kdepimlibs4: Auto-conflict with kdepim4

diff --git a/kde4/kdepimlibs4/CONFLICTS b/kde4/kdepimlibs4/CONFLICTS
index 472b2cd..5dd8c13 100755
--- a/kde4/kdepimlibs4/CONFLICTS
+++ b/kde4/kdepimlibs4/CONFLICTS
@@ -1 +1 @@
-conflicts kdepim4
+conflicts kdepim4 y
diff --git a/kde4/kdepimlibs4/HISTORY b/kde4/kdepimlibs4/HISTORY
index b404413..0be47cf 100644
--- a/kde4/kdepimlibs4/HISTORY
+++ b/kde4/kdepimlibs4/HISTORY
@@ -1,3 +1,6 @@
+2009-01-27 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Make it an auto-conflict
+
2009-01-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.2.0 (stable)
* CONFLICTS: added, libakonadi-abc.so.4 had moved



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (86e51bdbf6ff547ed0d44c2d4e580739396e98d5), Eric Sandall, 01/27/2009

Archive powered by MHonArc 2.6.24.

Top of Page