Merge "Enabling Multiple Interfaces in CStack." into connectivity-abstraction

author Sudarshan Prasad <sudarshan.prasad@intel.com>

Thu, 25 Dec 2014 08:06:31 +0000 (08:06 +0000)

committer Gerrit Code Review <gerrit@172.30.200.205>

Thu, 25 Dec 2014 08:06:31 +0000 (08:06 +0000)
author Sudarshan Prasad <sudarshan.prasad@intel.com>
Thu, 25 Dec 2014 08:06:31 +0000 (08:06 +0000)
committer Gerrit Code Review <gerrit@172.30.200.205>
Thu, 25 Dec 2014 08:06:31 +0000 (08:06 +0000)
diff --cc resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp
Simple merge
diff --cc resource/csdk/stack/src/ocstack.c
Simple merge
author	Sudarshan Prasad <sudarshan.prasad@intel.com>
	Thu, 25 Dec 2014 08:06:31 +0000 (08:06 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.205>
	Thu, 25 Dec 2014 08:06:31 +0000 (08:06 +0000)
		1	2
resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
resource/csdk/stack/src/ocstack.c	patch \|	diff1 \|	diff2 \|	blob \| history