review.tizen.org Git - platform/core/system/swap-manager.git/commit

projects / platform / core / system / swap-manager.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 549fb17 88a485d)

author	Vitaliy Cherepanov <v.cherepanov@samsung.com>
	Wed, 3 Jul 2013 14:15:12 +0000 (18:15 +0400)
committer	Vitaliy Cherepanov <v.cherepanov@samsung.com>
	Wed, 3 Jul 2013 14:15:12 +0000 (18:15 +0400)
commit	1b7a1baab5a285b44294a2fed3c7f8c67a824923
tree	7bf7328d62923336a02f33d7ca6e43f211d948fc	tree \| snapshot
parent	549fb176ae1f5dee3c8ee87712cd93ba48fef1f9	commit \| diff
parent	88a485da3152f9046007348bebf73a8d66180eb9	commit \| diff

Merge branch 'swap_protocol' of 106.109.8.71:/srv/git/sdk/dynamic-analysis-manager into swap_protocol

Conflicts:
daemon/da_protocol.c
daemon/transfer_thread.c

daemon/buffer.c	diff1 \|	diff2 \|	blob \| history
daemon/da_data.c	diff1 \|	diff2 \|	blob \| history
daemon/da_protocol.c	diff1 \|	diff2 \|	blob \| history
daemon/da_protocol.h	diff1 \|	diff2 \|	blob \| history
daemon/daemon.c	diff1 \|	diff2 \|	blob \| history
daemon/daemon.h	diff1 \|	diff2 \|	blob \| history
daemon/main.c	diff1 \|	diff2 \|	blob \| history
daemon/sys_stat.c	diff1 \|	diff2 \|	blob \| history
daemon/threads.c	diff1 \|	diff2 \|	blob \| history
daemon/transfer_thread.c	diff1 \|	diff2 \|	blob \| history
daemon/utils.c	diff1 \|	diff2 \|	blob \| history

Domain: SDK / Dynamic Analysis;