Merge branch 'devel/home/master'
authorSung-jae Park <nicesj.park@samsung.com>
Thu, 11 Dec 2014 03:23:38 +0000 (12:23 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Thu, 11 Dec 2014 03:23:40 +0000 (12:23 +0900)
commit4ae569a9dc81b1637a72dbd6334fc2ba007f41c7
tree0c4c25c9cf89a5adb9ac6f7eb449111c0e3d8039
parentba2ceb2f2a3a11548154c05bf1ddb3f0083c1399
parentca5bd97e7a77b0df12200bdc0fec3fd300152418
Merge branch 'devel/home/master'

Change-Id: Ica33c6f8f767e8618934af1e6c4ed015493cbdcf
src/slave_life.c