Merge tizen 2.4 into tizen 49/66049/3 accepted/tizen/common/20160418.141352 accepted/tizen/ivi/20160418.012438 accepted/tizen/mobile/20160418.012514 accepted/tizen/tv/20160418.012427 accepted/tizen/wearable/20160418.012429 submit/tizen/20160415.153127
authorHwankyu Jhun <h.jhun@samsung.com>
Fri, 15 Apr 2016 04:33:47 +0000 (13:33 +0900)
committerHwankyu Jhun <h.jhun@samsung.com>
Fri, 15 Apr 2016 08:08:43 +0000 (17:08 +0900)
commitc8b8c81f6d29f0ff4429c891b8e45cf3bdcfde19
tree5d52c07a9bf3585c35cc49ea408ba6b9f3a11a7b
parent1183b4922cc1abe42c6e38fc70baab0d2a5da2a6
Merge tizen 2.4 into tizen

- Fix the syspopup db
- Add a syspopup db for the wearable profile

Change-Id: Ib4a4d75a3add27a0d78a1ec92b9ef703b8e3f1d8
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
CMakeLists.txt
data/syspopup_db.sql
data/wearable/syspopup_db.sql [new file with mode: 0755]
packaging/syspopup.spec