Merge branch 'devel/home/master'
authorSung-jae Park <nicesj.park@samsung.com>
Tue, 25 Nov 2014 12:07:25 +0000 (21:07 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Tue, 25 Nov 2014 12:07:27 +0000 (21:07 +0900)
commitaf0cdb6fa0a2cee256cfcddde1ca9a33d4212ed9
tree86e65b2af508a7459dfbbf9ffcad9b231c76478d
parentbb66425a2c30b2854c1ef595f186047f56368979
parentdfb9502663a3929ec8803766e9bafba23a2ef350
Merge branch 'devel/home/master'

Change-Id: I75477ccc2e3771df88c889d51ff721f26d34980d
src/slave_life.c