sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (881e51f2e535121367eb1ef6634e2a5e8b501fc0)

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 (881e51f2e535121367eb1ef6634e2a5e8b501fc0)
Date: Sun, 16 Dec 2012 15:27:45 -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 881e51f2e535121367eb1ef6634e2a5e8b501fc0
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

efl contains eio now

diff --git a/e-17/efl/CONFLICTS b/e-17/efl/CONFLICTS
index 5c8c707..e69de4f 100755
--- a/e-17/efl/CONFLICTS
+++ b/e-17/efl/CONFLICTS
@@ -3,4 +3,5 @@ conflicts eet &&
conflicts embryo &&
conflicts evas &&
conflicts ecore &&
+conflicts eio &&
conflicts eobj
diff --git a/e-17/efl/HISTORY b/e-17/efl/HISTORY
index 46c060f..c90b20d 100644
--- a/e-17/efl/HISTORY
+++ b/e-17/efl/HISTORY
@@ -1,3 +1,6 @@
+2012-12-16 Ladislav Hagara <hgr AT vabo.cz>
+ * CONFLICTS: eio added
+
2012-12-03 Ladislav Hagara <hgr AT vabo.cz>
* CONFLICTS: ecore added

[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (881e51f2e535121367eb1ef6634e2a5e8b501fc0), Ladislav Hagara, 12/16/2012