Merge "hds: supports multiple hds connection" into tizen_2.4

author Sangho Park <sangho1206.park@samsung.com>

Fri, 8 May 2015 07:22:34 +0000 (16:22 +0900)

committer Gerrit Code Review <gerrit@tizensrc>

Fri, 8 May 2015 07:22:35 +0000 (16:22 +0900)
author Sangho Park <sangho1206.park@samsung.com>
Fri, 8 May 2015 07:22:34 +0000 (16:22 +0900)
committer Gerrit Code Review <gerrit@tizensrc>
Fri, 8 May 2015 07:22:35 +0000 (16:22 +0900)
diff --cc include/emuld.h
Simple merge
diff --cc packaging/emuld.spec
Simple merge
diff --cc src/emuld.cpp
Simple merge
author	Sangho Park <sangho1206.park@samsung.com>
	Fri, 8 May 2015 07:22:34 +0000 (16:22 +0900)
committer	Gerrit Code Review <gerrit@tizensrc>
	Fri, 8 May 2015 07:22:35 +0000 (16:22 +0900)
		1	2
include/emuld.h	patch \|	diff1 \|	diff2 \|	blob \| history
packaging/emuld.spec	patch \|	diff1 \|	diff2 \|	blob \| history
src/emuld.cpp	patch \|	diff1 \|	diff2 \|	blob \| history