sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (2998c1d8529569dcf2dda2f67feb066ebce0a737)

From: Ladislav Hagara <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (2998c1d8529569dcf2dda2f67feb066ebce0a737)
Date: Tue, 1 Jan 2013 11:24:20 -0600

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

e-17/efl/CONFLICTS | 2 ++
e-17/efl/HISTORY | 3 +++
2 files changed, 5 insertions(+)

New commits:
commit 2998c1d8529569dcf2dda2f67feb066ebce0a737
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

efl contains efreet and edbus now

diff --git a/e-17/efl/CONFLICTS b/e-17/efl/CONFLICTS
index e69de4f..06ce2ec 100755
--- a/e-17/efl/CONFLICTS
+++ b/e-17/efl/CONFLICTS
@@ -4,4 +4,6 @@ conflicts embryo &&
conflicts evas &&
conflicts ecore &&
conflicts eio &&
+conflicts efreet &&
+conflicts edbus &&
conflicts eobj
diff --git a/e-17/efl/HISTORY b/e-17/efl/HISTORY
index 2c673ee..9807fe8 100644
--- a/e-17/efl/HISTORY
+++ b/e-17/efl/HISTORY
@@ -1,3 +1,6 @@
+2013-01-01 Ladislav Hagara <hgr AT vabo.cz>
+ * CONFLICTS: efreet and edbus added
+
2012-12-21 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on fribidi >= 0.19.2
Depends on libxp

[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (2998c1d8529569dcf2dda2f67feb066ebce0a737), Ladislav Hagara, 01/01/2013