Merge branch 'tizen_3.0' into tizen 63/115263/1 accepted/tizen/common/20170217.161513 accepted/tizen/ivi/20170217.094355 accepted/tizen/mobile/20170217.094225 accepted/tizen/tv/20170217.094315 accepted/tizen/wearable/20170217.094338 submit/tizen/20170217.071740
authorsungwook79.park <sungwook79.park@samsung.com>
Fri, 17 Feb 2017 06:23:31 +0000 (15:23 +0900)
committersungwook79.park <sungwook79.park@samsung.com>
Fri, 17 Feb 2017 06:23:31 +0000 (15:23 +0900)
commit5c5c1a4ce294b76b1b3c5f265d00ac2ef5f9458e
treef3a6132304f037ac62a3ab3bcfb5e25dab774f6d
parent2544ed01ebb7cf51d46dda30d2744d25d80076a0
parent190b5da813dbb39691cb91139ea39f4037fdbe22
Merge branch 'tizen_3.0' into tizen

Conflicts:
packaging/isf.spec

Change-Id: I4ede5469acc451c0379221a60c4069c39ac831ac
configure.ac
packaging/isf.spec