From: hunje.yeon Date: Mon, 20 Jul 2015 09:54:27 +0000 (+0900) Subject: Merge branch 'resource-manipulation' into 'master' X-Git-Tag: 1.2.0+RC1~1430 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c620cdfed625498eb6df0833850103d3eaad46c6;p=platform%2Fupstream%2Fiotivity.git Merge branch 'resource-manipulation' into 'master' Add resource manipulation features such as resource container, broker, cache and server builder. It also includes API references at /resource/docs/Doxyfile. Change-Id: Id72cf1d99fe6d19a62f3b8f8e57c96ca91120c6b Signed-off-by: hunje.yeon --- c620cdfed625498eb6df0833850103d3eaad46c6