projects / framework / uifw / edje.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a90c3f5 577af0e)
Merge remote branch 'remotes/origin/upstream'
authorJiyoun Park <jy0703.park@samsung.com>
Fri, 13 Apr 2012 08:35:54 +0000 (17:35 +0900)
committerJiyoun Park <jy0703.park@samsung.com>
Fri, 13 Apr 2012 08:35:54 +0000 (17:35 +0900)
1  2 
src/lib/Edje.h patch | diff1 | diff2 | blob | history

diff --cc src/lib/Edje.h
Simple merge
Domain: UI Framework / Uncategorized;