From: Keane, Erich Date: Fri, 8 Aug 2014 23:48:27 +0000 (-0700) Subject: Merge "- US1321 - Now, C++ API users will be able to register multiple types and... X-Git-Tag: 1.2.0+RC1~2339 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e6f88d46b879b23a9904bdbe6b7fc0b05217cd51;p=platform%2Fupstream%2Fiotivity.git Merge "- US1321 - Now, C++ API users will be able to register multiple types and interfaces to a resource. The API names may change after review. - Removed unwanted trailing whitespaces at the end of lines. - Updated according to review comments." --- e6f88d46b879b23a9904bdbe6b7fc0b05217cd51