Merge branch 'devel/home/master'
authorSung-jae Park <nicesj.park@samsung.com>
Mon, 8 Dec 2014 04:07:03 +0000 (13:07 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Mon, 8 Dec 2014 04:07:07 +0000 (13:07 +0900)
commitba2ceb2f2a3a11548154c05bf1ddb3f0083c1399
tree11adb3e9d51c564db8bee1d0fafbe5fd3592f6e8
parent8abb9efef0d0696175896b2b2927102c54367db3
parentb38a7a6e8402f5bb7a497a0bf5bc73570272bd71
Merge branch 'devel/home/master'

Change-Id: Ifd7ad26656afaf26ee7832cdc8b871e568afeaaa
src/slave_life.c