Merge branch 'master' of https://github.sec.samsung.net/RS7-DeviceManagement/setup...
authorjiehwan.park <jiehwan.park@samsung.com>
Tue, 2 Jan 2018 06:13:03 +0000 (15:13 +0900)
committerjiehwan.park <jiehwan.park@samsung.com>
Tue, 2 Jan 2018 06:13:03 +0000 (15:13 +0900)
commitc633c8119897ed8914920a7e2e40d5228c747101
tree2a6a8877f366f44b741db80595968a515ac142b5
parentee63f20cc66072bcded926bf4603a82034b0380f
parent673afa57a66cf64d4b63dd61d3afbb1a86977ccb
Merge branch 'master' of https://github.sec.samsung.net/RS7-DeviceManagement/setup-adaptor into v0.1-resolve-duplication

Signed-off-by: jiehwan.park <jiehwan.park@samsung.com>
src/input_file.c
src/sa_types.h
src/setup_network.c