diff options
| author | Ladislav Hagara | 2013-01-29 04:51:34 +0100 |
|---|---|---|
| committer | Ladislav Hagara | 2013-01-29 04:51:34 +0100 |
| commit | 740e1b35a07d323a9e15ca3f0b382569c02750ba (patch) | |
| tree | 8c286a24ab94dbeb87cb00b610336bac7de8b139 /e-17 | |
| parent | 396212f45bd329baa1734d9c18fed94e8feae054 (diff) | |
efl conflicts also with eeze and ephysics
Diffstat (limited to 'e-17')
| -rwxr-xr-x | e-17/efl/CONFLICTS | 2 | ||||
| -rw-r--r-- | e-17/efl/HISTORY | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/e-17/efl/CONFLICTS b/e-17/efl/CONFLICTS index ce2ae3ba48..efa73e05fb 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 0a4b7043ad..879647c4eb 100644 --- a/e-17/efl/HISTORY +++ b/e-17/efl/HISTORY @@ -1,3 +1,6 @@ +2013-01-29 Ladislav Hagara <hgr@vabo.cz> + * CONFLICTS: eeze and ephysics added + 2013-01-12 Ladislav Hagara <hgr@vabo.cz> * CONFLICTS: edje, emotion and ethumb added |