Merge branch 'tizen_3.0' into tizen 17/102117/1
authorJihoon Kim <jihoon48.kim@samsung.com>
Mon, 5 Dec 2016 04:49:52 +0000 (13:49 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Mon, 5 Dec 2016 04:49:52 +0000 (13:49 +0900)
commitf5656368514ffb7d4eb484f416a5d82e7601f1a4
tree42e98d2ecfa8d984859afb6acb5e19f93a45eff9
parent234f7a3051c1b03cdfd62e2ad7172d0dd7c75101
parent5b73e396954b8d552f6852b59ddb4e0d2fbbe0ea
Merge branch 'tizen_3.0' into tizen

Conflicts:
packaging/ise-default.spec

Change-Id: Ie7995fc05e2d3553239132ec81cc0ba069c8d3c0
CMakeLists.txt
packaging/ise-default.spec