projects / platform / upstream / iotivity.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1f885a3) | patch
Fix build break.
authorDan Mihai <Daniel.Mihai@microsoft.com>
Sun, 1 Jan 2017 10:46:39 +0000 (02:46 -0800)
committerDan Mihai <Daniel.Mihai@microsoft.com>
Sun, 1 Jan 2017 16:36:55 +0000 (16:36 +0000)
commitf2f73c75fdb2fba28b0a2c02f5308ac54bb0606e
tree68f378c08351e2de0d2739487ca68424a0de8268tree | snapshot
parent1f885a36f6258373bef2c08c46d12b3b9d615551commit | diff
Fix build break.

Fix conflict between recent commits
1f885a36f6258373bef2c08c46d12b3b9d615551
d4f573ea1f2a0089fb7d53980ac39c39673391cb

Change-Id: Ic740ab0a8c57810b4a5f0841a42905ae09052d88
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16031
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
resource/c_common/oic_malloc/test/linux/oic_malloc_tests.cpp diff | blob | history
Domain: Network & Connectivity / IoT Connectivity;