projects / profile / ivi / edje.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b41fb87) | patch
Merge branch 'elmdnd'
authornash <nash@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Tue, 7 Sep 2010 06:56:16 +0000 (06:56 +0000)
committernash <nash@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Tue, 7 Sep 2010 06:56:16 +0000 (06:56 +0000)
commit467f7970f0bf09e3ad1bfc122dc8b0b875dddf94
tree6cca07909f57e65210e965322ee24612c12038c6tree | snapshot
parentb41fb87b5fe6375a484099b31faeb6b5f5bc1da9commit | diff
Merge branch 'elmdnd'

Conflicts:
trunk/TMP/st/elementary/.gitignore

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/edje@51935 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
.gitignore [new file with mode: 0644] blob
src/lib/Edje.h diff | blob | history
src/lib/edje_cache.c diff | blob | history
src/lib/edje_entry.c diff | blob | history
src/lib/edje_private.h diff | blob | history
src/lib/edje_util.c diff | blob | history
Domain: UI Framework / Uncategorized;