Merge branch 'devel/home/master'
authorSung-jae Park <nicesj.park@samsung.com>
Sat, 1 Nov 2014 08:16:44 +0000 (17:16 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Sat, 1 Nov 2014 08:16:44 +0000 (17:16 +0900)
Conflicts:
data/x11.mobile.480x800.conf.ini
src/event.c

Change-Id: I1c0e9947c7aa5b0df3456ffc0a2ff36d49565c90


Trivial merge