Merge branch 'tizen' into feature/noti_ex

author jusung son <jusung07.son@samsung.com>

Fri, 29 Mar 2019 05:39:55 +0000 (14:39 +0900)

committer jusung son <jusung07.son@samsung.com>

Fri, 29 Mar 2019 05:39:55 +0000 (14:39 +0900)
author jusung son <jusung07.son@samsung.com>
Fri, 29 Mar 2019 05:39:55 +0000 (14:39 +0900)
committer jusung son <jusung07.son@samsung.com>
Fri, 29 Mar 2019 05:39:55 +0000 (14:39 +0900)
diff --cc AUTHORS

index de95323,fa6ae31..fa6ae31

mode 100755,100644..100755
--- 1/AUTHORS
--- 2/AUTHORS
+++ b/AUTHORS
diff --cc CMakeLists.txt

index 1f80c2f,90ed25c..90ed25c

mode 100755,100644..100755
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
diff --cc packaging/notification.spec

index 8803c75,02252ac..02252ac

mode 100755,100644..100755
--- 1/packaging/notification.spec
--- 2/packaging/notification.spec
+++ b/packaging/notification.spec
author	jusung son <jusung07.son@samsung.com>
	Fri, 29 Mar 2019 05:39:55 +0000 (14:39 +0900)
committer	jusung son <jusung07.son@samsung.com>
	Fri, 29 Mar 2019 05:39:55 +0000 (14:39 +0900)
		1	2
AUTHORS	patch \|	diff1 \|	diff2 \|	blob \| history
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
packaging/notification.spec	patch \|	diff1 \|	diff2 \|	blob \| history