Merge "Implemented libcoap's tinyDTLS interface"

author Erich Keane <erich.keane@intel.com>

Fri, 14 Nov 2014 00:16:10 +0000 (16:16 -0800)

committer Gerrit Code Review <gerrit@oicreview.vlan14.01.org>

Fri, 14 Nov 2014 00:16:10 +0000 (16:16 -0800)
author Erich Keane <erich.keane@intel.com>
Fri, 14 Nov 2014 00:16:10 +0000 (16:16 -0800)
committer Gerrit Code Review <gerrit@oicreview.vlan14.01.org>
Fri, 14 Nov 2014 00:16:10 +0000 (16:16 -0800)
diff --cc resource/csdk/occoap/src/occoap.c
Simple merge
diff --cc resource/csdk/stack/include/internal/ocstackinternal.h
Simple merge
diff --cc resource/csdk/stack/include/ocstack.h
Simple merge
diff --cc resource/csdk/stack/src/ocstack.c
Simple merge
author	Erich Keane <erich.keane@intel.com>
	Fri, 14 Nov 2014 00:16:10 +0000 (16:16 -0800)
committer	Gerrit Code Review <gerrit@oicreview.vlan14.01.org>
	Fri, 14 Nov 2014 00:16:10 +0000 (16:16 -0800)
		1	2
resource/csdk/occoap/src/occoap.c	patch \|	diff1 \|	diff2 \|	blob \| history
resource/csdk/stack/include/internal/ocstackinternal.h	patch \|	diff1 \|	diff2 \|	blob \| history
resource/csdk/stack/include/ocstack.h	patch \|	diff1 \|	diff2 \|	blob \| history
resource/csdk/stack/src/ocstack.c	patch \|	diff1 \|	diff2 \|	blob \| history