Merge branch 'group-manager'
authorJihun Ha <jihun.ha@samsung.com>
Mon, 7 Mar 2016 01:27:55 +0000 (10:27 +0900)
committerJihun Ha <jihun.ha@samsung.com>
Mon, 7 Mar 2016 01:27:55 +0000 (10:27 +0900)
commit8945accc6fbae437bc06c8ebf207d4b029f8566d
treecea69a74464a9478a5b615e38377b01ff4bd281f
parentf5805d8258eac0650ccdcb60864883b2aad7a866
parent29506b9bdf9be5ff8939691708570dbe9a7d73c1
Merge branch 'group-manager'

Conflicts:
service/SConscript

Change-Id: I583ef696a20ee406c2d6c17a79daabb0cbbf83d5
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
resource/docs/Doxyfile
service/SConscript
tools/tizen/.gbs.conf