projects / contrib / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74cc2bd f3d577e)
Merge branch 'master' into easysetup
authorMadan Lanka <lanka.madan@samsung.com>
Wed, 3 Jun 2015 05:16:02 +0000 (01:16 -0400)
committerMadan Lanka <lanka.madan@samsung.com>
Wed, 3 Jun 2015 05:24:26 +0000 (01:24 -0400)
Merging latest files from master branch to easysetup branch

Change-Id: I5443a2361f749868a88ec0e37c6e20d337209ed6
Signed-off-by: Madan Lanka <lanka.madan@samsung.com>

Trivial merge
Domain: SCM / Uncategorized;