projects / platform / framework / web / livebox-edje.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de7db30 cff25ea)
Merge branch 'tizen' of ssh://review.tizen.org:29418/platform/framework/web/livebox... 84/15484/1
authorSung-jae Park <nicesj.park@samsung.com>
Wed, 22 Jan 2014 00:23:10 +0000 (09:23 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Wed, 22 Jan 2014 00:23:10 +0000 (09:23 +0900)
Conflicts:
src/script_port.c

Change-Id: I86dca8dcdf8a2534691914bcfdc42f1aeebadc09


Trivial merge
Domain: Web Framework / Uncategorized;