Skip to Content.
Sympa Menu

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

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 (75bd6f8820721c977022b2ccf978a402c04c3328)
  • Date: Fri, 4 May 2007 11:48:18 -0500

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

x11-toolkits/qt4/CONFLICTS | 2 +-
x11-toolkits/qt4/HISTORY | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)

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

qt4 - fix CONFLICTS

diff --git a/x11-toolkits/qt4/CONFLICTS b/x11-toolkits/qt4/CONFLICTS
index ddbffc6..be85071 100755
--- a/x11-toolkits/qt4/CONFLICTS
+++ b/x11-toolkits/qt4/CONFLICTS
@@ -1 +1 @@
-conflicts qt4
+conflicts qt4 y
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 47ed322..a77a81e 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,6 @@
+2007-05-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS: add 'y' option, for automatic dispel
+
2007-05-03 Treeve Jelbert <treeve AT sourcemage.org>
* PREPARE: allow stable, prerelease and snapshots
* DETAILS: version 4.3.0-snapshot-20070503



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (75bd6f8820721c977022b2ccf978a402c04c3328), Treeve Jelbert, 05/04/2007

Archive powered by MHonArc 2.6.24.

Top of Page