projects / framework / uifw / edje.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fef511 ebe2f06)
Merge remote-tracking branch 'origin/upstream'
authorMike McCormack <mj.mccormack@samsung.com>
Thu, 17 Nov 2011 00:36:02 +0000 (09:36 +0900)
committerMike McCormack <mj.mccormack@samsung.com>
Thu, 17 Nov 2011 00:36:02 +0000 (09:36 +0900)
1  2 
src/bin/edje_cc_handlers.c patch | diff1 | diff2 | blob | history
src/lib/Edje.h patch | diff1 | diff2 | blob | history

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