Merge branch 'swap_protocol' of 106.109.8.71:/srv/git/sdk/dynamic-analysis-manager...
authorVitaliy Cherepanov <v.cherepanov@samsung.com>
Thu, 1 Aug 2013 12:01:01 +0000 (16:01 +0400)
committerVitaliy Cherepanov <v.cherepanov@samsung.com>
Thu, 1 Aug 2013 12:01:01 +0000 (16:01 +0400)
commit5fae2d4e43ddc4ad5f70f38629365f8f0d21a94b
tree38cecfb095733001ef144c609d36b9875ddaf58b
parenta8edcaf25f72b8e6bff37070e27194474135c4ad
parent1cf94ea564700dcb33d128c1e6d7584d4735e98f
Merge branch 'swap_protocol' of 106.109.8.71:/srv/git/sdk/dynamic-analysis-manager into swap_protocol

Conflicts:
daemon/sys_stat.c
daemon/daemon.c
daemon/sys_stat.c
daemon/threads.c