projects / framework / uifw / edje.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6afe669 0975a61)
Merge remote branch 'origin/upstream' into svn_merge
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Mon, 22 Aug 2011 08:35:21 +0000 (17:35 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Mon, 22 Aug 2011 08:35:21 +0000 (17:35 +0900)
1  2 
src/lib/edje_calc.c patch | diff1 | diff2 | blob | history
src/lib/edje_util.c patch | diff1 | diff2 | blob | history

diff --cc src/lib/edje_calc.c
Simple merge
diff --cc src/lib/edje_util.c
Simple merge
Domain: UI Framework / Uncategorized;