projects / platform / core / api / notification.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 727ebe6 18d51ef)
Merge branch 'tizen' into feature/noti_ex feature/noti_ex
authorjusung son <jusung07.son@samsung.com>
Fri, 29 Mar 2019 05:39:55 +0000 (14:39 +0900)
committerjusung son <jusung07.son@samsung.com>
Fri, 29 Mar 2019 05:39:55 +0000 (14:39 +0900)
Conflicts:
AUTHORS
CMakeLists.txt
LICENSE
packaging/notification.spec

1  2 
AUTHORS patch | diff1 | diff2 | blob | history
CMakeLists.txt patch | diff1 | diff2 | blob | history
packaging/notification.spec patch | diff1 | diff2 | blob | history

diff --cc AUTHORS
index de95323651200dfa5e0fd7795fa5825a11d23bb2,fa6ae31280e8741ee8a2768fae512937fb0f69d5..fa6ae31280e8741ee8a2768fae512937fb0f69d5
mode 100755,100644..100755
--- 1/AUTHORS
--- 2/AUTHORS
+++ b/AUTHORS
diff --cc CMakeLists.txt
index 1f80c2f42e441a197b15daed06db5ef39b65119c,90ed25c885e03a7637c7afadbdad09d29aea15f6..90ed25c885e03a7637c7afadbdad09d29aea15f6
mode 100755,100644..100755
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
diff --cc packaging/notification.spec
index 8803c754ffdca118fb70de9923b6be8a56add2e6,02252acc184f18638859d56fc17e0b62ff7b802f..02252acc184f18638859d56fc17e0b62ff7b802f
mode 100755,100644..100755
--- 1/packaging/notification.spec
--- 2/packaging/notification.spec
+++ b/packaging/notification.spec
Domain: App Framework / Notification;