Merge branch 'swap_protocol' of 106.109.8.71:/srv/git/sdk/dynamic-analysis-manager...
authorVitaliy Cherepanov <v.cherepanov@samsung.com>
Mon, 15 Jul 2013 10:15:09 +0000 (14:15 +0400)
committerVitaliy Cherepanov <v.cherepanov@samsung.com>
Mon, 15 Jul 2013 10:15:09 +0000 (14:15 +0400)
1  2 
daemon/Makefile

diff --cc daemon/Makefile
Simple merge