sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (167db4901b8767e63a46d84973f7c717ae9e294f)

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 (167db4901b8767e63a46d84973f7c717ae9e294f)
Date: Mon, 3 Dec 2012 08:07:43 -0600

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

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

New commits:
commit 167db4901b8767e63a46d84973f7c717ae9e294f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

efl contains ecore now

diff --git a/e-17/efl/CONFLICTS b/e-17/efl/CONFLICTS
index 855763f..5c8c707 100755
--- a/e-17/efl/CONFLICTS
+++ b/e-17/efl/CONFLICTS
@@ -2,4 +2,5 @@ conflicts eina &&
conflicts eet &&
conflicts embryo &&
conflicts evas &&
+conflicts ecore &&
conflicts eobj
diff --git a/e-17/efl/HISTORY b/e-17/efl/HISTORY
index c5bcbd8..46c060f 100644
--- a/e-17/efl/HISTORY
+++ b/e-17/efl/HISTORY
@@ -1,2 +1,5 @@
+2012-12-03 Ladislav Hagara <hgr AT vabo.cz>
+ * CONFLICTS: ecore added
+
2012-11-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, DEPENDS, PREPARE, PRE_BUILD, CONFLICTS: spell created

[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (167db4901b8767e63a46d84973f7c717ae9e294f), Ladislav Hagara, 12/03/2012