review.tizen.org Git - platform/upstream/iotivity.git/commit

projects / platform / upstream / iotivity.git / commit

author	HyunJun Kim <hyunjun2.kim@samsung.com>
	Thu, 2 Apr 2015 08:53:41 +0000 (17:53 +0900)
committer	Uze Choi <uzchoi@samsung.com>
	Thu, 9 Apr 2015 04:06:03 +0000 (04:06 +0000)
commit	edcca2c1c628e353265bc3f6db38212730b219c5
tree	e612bd420857d056c4273d2f32c7b802f52b5e8a	tree \| snapshot
parent	4ef23d30d0dba85164073b2baa17e13089447844	commit \| diff

Merge Things Manager codes CA and Master branch.

It was modified base on CA for preparing for official merge.

Change-Id: If3cb90d9a1a03a8d79d95952f5dfabb07c526634
Signed-off-by: HyunJun Kim <hyunjun2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/632
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

30 files changed:

extlibs/timer/timer.c	[new file with mode: 0755]	blob
extlibs/timer/timer.h	[new file with mode: 0755]	blob
service/things-manager/SConscript	[changed mode: 0644->0755]	diff \| blob \| history
service/things-manager/sampleapp/linux/configuration/ConfigurationCollection.cpp	[changed mode: 0644->0755]	diff \| blob \| history
service/things-manager/sampleapp/linux/configuration/ConfigurationCollection.h	[changed mode: 0644->0755]	diff \| blob \| history
service/things-manager/sampleapp/linux/configuration/DiagnosticsCollection.cpp	[changed mode: 0644->0755]	diff \| blob \| history
service/things-manager/sampleapp/linux/configuration/DiagnosticsCollection.h	[changed mode: 0644->0755]	diff \| blob \| history
service/things-manager/sampleapp/linux/configuration/FactorySetCollection.cpp	[changed mode: 0644->0755]	diff \| blob \| history
service/things-manager/sampleapp/linux/configuration/FactorySetCollection.h	[changed mode: 0644->0755]	diff \| blob \| history
service/things-manager/sampleapp/linux/configuration/SConscript	[changed mode: 0644->0755]	diff \| blob \| history
service/things-manager/sampleapp/linux/configuration/bootstrapserver.cpp	[changed mode: 0644->0755]	diff \| blob \| history
service/things-manager/sampleapp/linux/configuration/con-client.cpp	[changed mode: 0644->0755]	diff \| blob \| history
service/things-manager/sampleapp/linux/configuration/con-server.cpp	[changed mode: 0644->0755]	diff \| blob \| history
service/things-manager/sampleapp/linux/groupaction/SConscript		diff \| blob \| history
service/things-manager/sampleapp/linux/groupaction/groupserver.cpp	[changed mode: 0644->0755]	diff \| blob \| history
service/things-manager/sampleapp/linux/groupsyncaction/SConscript		diff \| blob \| history
service/things-manager/sampleapp/linux/groupsyncaction/group.cpp		diff \| blob \| history
service/things-manager/sampleapp/linux/groupsyncaction/phone.cpp		diff \| blob \| history
service/things-manager/sdk/inc/ActionSet.h	[changed mode: 0644->0755]	diff \| blob \| history
service/things-manager/sdk/inc/ThingsManager.h	[changed mode: 0644->0755]	diff \| blob \| history
service/things-manager/sdk/src/ActionSet.cpp	[new file with mode: 0755]	blob
service/things-manager/sdk/src/GroupManager.cpp	[changed mode: 0644->0755]	diff \| blob \| history
service/things-manager/sdk/src/GroupManager.h		diff \| blob \| history
service/things-manager/sdk/src/GroupSynchronization.cpp		diff \| blob \| history
service/things-manager/sdk/src/GroupSynchronization.h		diff \| blob \| history
service/things-manager/sdk/src/ThingsConfiguration.cpp	[changed mode: 0644->0755]	diff \| blob \| history
service/things-manager/sdk/src/ThingsConfiguration.h	[changed mode: 0644->0755]	diff \| blob \| history
service/things-manager/sdk/src/ThingsDiagnostics.cpp	[changed mode: 0644->0755]	diff \| blob \| history
service/things-manager/sdk/src/ThingsDiagnostics.h	[changed mode: 0644->0755]	diff \| blob \| history
service/things-manager/sdk/src/ThingsManager.cpp		diff \| blob \| history

Domain: Network & Connectivity / IoT Connectivity;

RSS Atom