From: Madan Lanka <lanka.madan@samsung.com>
Date: Fri, 5 Aug 2016 05:18:03 +0000 (+0000)
Subject: Merge "Merge branch 'master' into notification-service" into notification-service
X-Git-Tag: 1.2.0+RC1~52^2~93
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7971eea6746afbea2c37e924e7f3c96780a85fb1;hp=5d0c9be426113ad25185853ac72593b582717382;p=platform%2Fupstream%2Fiotivity.git

Merge "Merge branch 'master' into notification-service" into notification-service
---

diff --git a/service/notification/src/common/NSStructs.h b/service/notification/src/common/NSStructs.h
index 80c6706..752f173 100644
--- a/service/notification/src/common/NSStructs.h
+++ b/service/notification/src/common/NSStructs.h
@@ -105,6 +105,7 @@ typedef struct
 {
     char providerId[37];
     char * providerName;
+    char * userInfo;
 } NSProviderInfo;
 
 #endif /* _NS_STRUCTS_H_ */