From: Jon A. Cruz <jonc@osg.samsung.com>
Date: Wed, 30 Sep 2015 18:57:36 +0000 (+0000)
Subject: Merge "Merge Resource Directory into the master"
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9e0e63abc3a87386f0f84c57853e79556b3d6004;p=contrib%2Fiotivity.git

Merge "Merge Resource Directory into the master"
---

9e0e63abc3a87386f0f84c57853e79556b3d6004
diff --cc resource/docs/Doxyfile
index 4507b96,cf72346..08ad486
--- a/resource/docs/Doxyfile
+++ b/resource/docs/Doxyfile
@@@ -670,8 -670,11 +670,9 @@@ INPUT                  = . 
                           ../csdk/stack/include/ocstackconfig.h \
                           guides \
                           ../../service/things-manager/sdk/inc \
 -                         ../../service/soft-sensor-manager/SDK/cpp/include \
 -                         ../../service/protocol-plugin/plugin-manager/src/PluginManager.h \
 -                         ../../service/notification-manager/NotificationManager/include/hosting.h \
 +                         ../../service/resource-hosting/include/hosting.h \
                           ../../service/resource-encapsulation/include \
+                          ../../service/resource-directory/include \
  
  # This tag can be used to specify the character encoding of the source files
  # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is