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)
commitd1611876719ffb6d1e4d556fe13d0b07267e62fe
tree9486df00f9c6d23623ebf80fd15c36fdca0a939a
parent651ddd6ecc6f9cfe4ad285f3835bddbcd8841379
parent0bfdab3e0bc1f8a5a4e566944a7b0789743beb3e
Merge branch 'tizen_2.3' into tizen_2.4

Conflicts:
dynamicbox_viewer/src/client.c
dynamicbox_viewer/src/desc_parser.c
dynamicbox_viewer/src/dynamicbox_internal.c

Change-Id: Ibe5a546526138714a90c55181c2263afe0bfdbab