sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (0d1e90f7f7ba8ea5d0e724913104724ea284038c)
- 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 (0d1e90f7f7ba8ea5d0e724913104724ea284038c)
- Date: Sat, 12 Jan 2013 13:33:26 -0600
GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:
e-17/efl/CONFLICTS | 3 +++
e-17/efl/HISTORY | 3 +++
2 files changed, 6 insertions(+)
New commits:
commit 0d1e90f7f7ba8ea5d0e724913104724ea284038c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
efl contains edje, emotion and ethumb
diff --git a/e-17/efl/CONFLICTS b/e-17/efl/CONFLICTS
index 46dd403..ce2ae3b 100755
--- a/e-17/efl/CONFLICTS
+++ b/e-17/efl/CONFLICTS
@@ -1,9 +1,12 @@
conflicts ecore &&
conflicts edbus &&
+conflicts edje &&
conflicts eet &&
conflicts efreet &&
conflicts eina &&
conflicts eio &&
conflicts embryo &&
+conflicts emotion &&
conflicts eobj &&
+conflicts ethumb &&
conflicts evas
diff --git a/e-17/efl/HISTORY b/e-17/efl/HISTORY
index ee61972..0a4b704 100644
--- a/e-17/efl/HISTORY
+++ b/e-17/efl/HISTORY
@@ -1,3 +1,6 @@
+2013-01-12 Ladislav Hagara <hgr AT vabo.cz>
+ * CONFLICTS: edje, emotion and ethumb added
+
2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on valgrind
Optionally depends on bullet (in games)
- [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (0d1e90f7f7ba8ea5d0e724913104724ea284038c), Ladislav Hagara, 01/12/2013
Archive powered by MHonArc 2.6.24.