sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (740e1b35a07d323a9e15ca3f0b382569c02750ba)

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 (740e1b35a07d323a9e15ca3f0b382569c02750ba)
Date: Mon, 28 Jan 2013 20:52: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 740e1b35a07d323a9e15ca3f0b382569c02750ba
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

efl conflicts also with eeze and ephysics

diff --git a/e-17/efl/CONFLICTS b/e-17/efl/CONFLICTS
index ce2ae3b..efa73e0 100755
--- a/e-17/efl/CONFLICTS
+++ b/e-17/efl/CONFLICTS
@@ -2,11 +2,13 @@ conflicts ecore &&
conflicts edbus &&
conflicts edje &&
conflicts eet &&
+conflicts eeze &&
conflicts efreet &&
conflicts eina &&
conflicts eio &&
conflicts embryo &&
conflicts emotion &&
conflicts eobj &&
+conflicts ephysics &&
conflicts ethumb &&
conflicts evas
diff --git a/e-17/efl/HISTORY b/e-17/efl/HISTORY
index 0a4b704..879647c 100644
--- a/e-17/efl/HISTORY
+++ b/e-17/efl/HISTORY
@@ -1,3 +1,6 @@
+2013-01-29 Ladislav Hagara <hgr AT vabo.cz>
+ * CONFLICTS: eeze and ephysics added
+
2013-01-12 Ladislav Hagara <hgr AT vabo.cz>
* CONFLICTS: edje, emotion and ethumb added

[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (740e1b35a07d323a9e15ca3f0b382569c02750ba), Ladislav Hagara, 01/28/2013