Merge "Merge Resource Directory into the master"
authorJon A. Cruz <jonc@osg.samsung.com>
Wed, 30 Sep 2015 18:57:36 +0000 (18:57 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Wed, 30 Sep 2015 18:57:36 +0000 (18:57 +0000)
commit9e0e63abc3a87386f0f84c57853e79556b3d6004
tree83d4ee9cc37d797b44e19f03137dcef8fe96353c
parent758e307a204b5b66dbf81ab6ed73463d7024f44d
parentcc68c51711ac0211b3c29da57ef6f794dd2f6120
Merge "Merge Resource Directory into the master"
resource/csdk/stack/src/ocresource.c
resource/docs/Doxyfile
service/SConscript