Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d93264b1d240375602d791b70fb936e0a3728a3b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d93264b1d240375602d791b70fb936e0a3728a3b)
  • Date: Fri, 1 Feb 2008 10:09:51 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

kde4/kdelibs4/CONFLICTS | 2 +-
kde4/kdelibs4/HISTORY | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit d93264b1d240375602d791b70fb936e0a3728a3b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kdelibs4 - update CONFLICTS

diff --git a/kde4/kdelibs4/CONFLICTS b/kde4/kdelibs4/CONFLICTS
index 1192ea3..e04c053 100755
--- a/kde4/kdelibs4/CONFLICTS
+++ b/kde4/kdelibs4/CONFLICTS
@@ -1,2 +1,2 @@
-conflicts kdelibs4 y
+conflicts kdebase4-runtime y

diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index 24f088f..994e166 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,8 @@
+2008-02-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS: conflict with kdebase4-runtime,
+ as FindXine.cmake was previously provided by kdebase4-runtime,
+ whereas it now comes from kdelibs4
+
2008-01-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.0.60
KEYWORDS=kde4




Archive powered by MHonArc 2.6.24.

Top of Page