projects / platform / core / appfw / widget-viewer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 651ddd6 0bfdab3)
Merge branch 'tizen_2.3' into tizen_2.4
authorSung-jae Park <nicesj.park@samsung.com>
Mon, 2 Feb 2015 00:52:38 +0000 (09:52 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Mon, 2 Feb 2015 00:52:38 +0000 (09:52 +0900)
Conflicts:
dynamicbox_viewer/src/client.c
dynamicbox_viewer/src/desc_parser.c
dynamicbox_viewer/src/dynamicbox_internal.c

Change-Id: Ibe5a546526138714a90c55181c2263afe0bfdbab


Trivial merge
Domain: App Framework / Widget;