Merge branch 'swap_protocol' of ssh://106.109.8.71/srv/git/sdk/dynamic-analysis-manag...
authorNikita Kalyazin <n.kalyazin@samsung.com>
Sun, 7 Jul 2013 09:37:04 +0000 (13:37 +0400)
committerNikita Kalyazin <n.kalyazin@samsung.com>
Sun, 7 Jul 2013 09:37:04 +0000 (13:37 +0400)
1  2 
daemon/daemon.h
daemon/threads.c
daemon/transfer_thread.c

diff --cc daemon/daemon.h
Simple merge
Simple merge
Simple merge