edje migration revision 70401
authorTae-Hwan Kim <the81.kim@samsung.com>
Mon, 23 Apr 2012 04:30:59 +0000 (13:30 +0900)
committerTae-Hwan Kim <the81.kim@samsung.com>
Mon, 23 Apr 2012 05:43:59 +0000 (14:43 +0900)
Merge remote-tracking branch 'origin/upstream'

Change-Id: I88cd3d8dcf1def4fb77a632abdb18d368fdbf132

1  2 
src/lib/Edje.h
src/lib/edje_util.c

diff --cc src/lib/Edje.h
Simple merge
Simple merge