review.tizen.org Git - contrib/iotivity.git/commit

projects / contrib / iotivity.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5df34e8 5abf72f)

author	Harish Kumara Marappa <h.marappa@samsung.com>
	Mon, 7 Mar 2016 10:30:52 +0000 (16:00 +0530)
committer	Harish Kumara Marappa <h.marappa@samsung.com>
	Mon, 7 Mar 2016 10:30:52 +0000 (16:00 +0530)
commit	a29c54ef36ae8b0ea7769604aabd5851a2103d33
tree	140b7c01d62aca5c74b9c1efb3c0b036d6418118	tree \| snapshot
parent	5df34e8e220355f38a4d4f3ee6a245f8770c95b7	commit \| diff
parent	5abf72f56ce6e33d8c4c9577486d71f79481f3c8	commit \| diff

Merge branch 'simulator'.

Change-Id: I7566052325446e1887fa531af4e6f47c4f4089db
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>

12 files changed:

service/simulator/SConscript	diff1 \|	diff2 \|	blob \| history
service/simulator/src/client/get_request_generator.cpp	diff1 \|	diff2 \|	blob \| history
service/simulator/src/client/post_request_generator.cpp	diff1 \|	diff2 \|	blob \| history
service/simulator/src/client/put_request_generator.cpp	diff1 \|	diff2 \|	blob \| history
service/simulator/src/client/request_automation_manager.cpp	diff1 \|	diff2 \|	blob \| history
service/simulator/src/client/simulator_remote_resource_impl.cpp	diff1 \|	diff2 \|	blob \| history
service/simulator/src/common/request_model_builder.cpp	diff1 \|	diff2 \|	blob \| history
service/simulator/src/common/resource_model_schema_builder.cpp	\|	diff2 \|	blob \| history
service/simulator/src/server/resource_update_automation.cpp	diff1 \|	diff2 \|	blob \| history
service/simulator/src/server/simulator_collection_resource_impl.cpp	diff1 \|	diff2 \|	blob \| history
service/simulator/src/server/simulator_resource_factory.cpp	diff1 \|	diff2 \|	blob \| history
service/simulator/src/server/simulator_single_resource_impl.cpp	diff1 \|	diff2 \|	blob \| history

Domain: SCM / Uncategorized;