Merge "Add notification privilege and log" into tizen

author taesubkim <taesub.kim@samsung.com>

Tue, 7 Jun 2016 08:45:07 +0000 (01:45 -0700)

committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>

Tue, 7 Jun 2016 08:45:08 +0000 (01:45 -0700)
author taesubkim <taesub.kim@samsung.com>
Tue, 7 Jun 2016 08:45:07 +0000 (01:45 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 7 Jun 2016 08:45:08 +0000 (01:45 -0700)
diff --cc include/net-popup-strings.h

index fcb5afb44bf3af35230d50786241129decf741c8,568b7c1a9a2da137971d747ef5df1451bdf355eb..fcb5afb44bf3af35230d50786241129decf741c8

mode 100644,100755..100755
--- 1/include/net-popup-strings.h
--- 2/include/net-popup-strings.h
+++ b/include/net-popup-strings.h
diff --cc packaging/net.netpopup.spec

index bde968ba167b4d5d93aee21cc1df6e587b1cacb3,d18e8330f03bc4e7b3846c9b2f8f01aea22f7c81..bde968ba167b4d5d93aee21cc1df6e587b1cacb3

mode 100644,100755..100755
--- 1/packaging/net.netpopup.spec
--- 2/packaging/net.netpopup.spec
+++ b/packaging/net.netpopup.spec
diff --cc src/net-popup.c
Simple merge
author	taesubkim <taesub.kim@samsung.com>
	Tue, 7 Jun 2016 08:45:07 +0000 (01:45 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Tue, 7 Jun 2016 08:45:08 +0000 (01:45 -0700)
		1	2
include/net-popup-strings.h	patch \|	diff1 \|	diff2 \|	blob \| history
packaging/net.netpopup.spec	patch \|	diff1 \|	diff2 \|	blob \| history
src/net-popup.c	patch \|	diff1 \|	diff2 \|	blob \| history