Merge "Merge Resource Directory into the master" into 1.0.0-dev 1.0.0-RC2
authorUze Choi <uzchoi@samsung.com>
Thu, 1 Oct 2015 11:37:23 +0000 (11:37 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Thu, 1 Oct 2015 11:37:23 +0000 (11:37 +0000)
commitd55f583982e3776f2eb8b5efbbe2c447d1d32684
tree577f438a9d35fa6467fd8e38b4595519a2686a22
parent529d886aba18d95f1e983c63a0cbf9d960513832
parentf426c86c017b804d73b935ec706c12d0e0694f21
Merge "Merge Resource Directory into the master" into 1.0.0-dev
resource/csdk/stack/src/ocresource.c