Merge branch 'devel/home/master'
authorSung-jae Park <nicesj.park@samsung.com>
Mon, 17 Nov 2014 03:57:15 +0000 (12:57 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Mon, 17 Nov 2014 03:57:15 +0000 (12:57 +0900)
commit985fd38f132908b425731a12b02e15754691d08f
tree21374785d7a70fab126f996fbfda129a0f7952f3
parente2b0d335bedad8e56ab012555882494961bf0c78
parentcd7ee867a8c37c83710b8bd06ccbb26ac2a50e8d
Merge branch 'devel/home/master'

Conflicts:
src/server.c

Ping timer is changed to 20 seconds. (for mobile)
Slave's priority will be lower than normal until it is used by user

Change-Id: I4e4e389bfe0f517ce1d19607e13156bce4176219
data/x11.mobile.480x800.conf.ini
src/slave_life.c