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)
commitb017ba0793e7e430cf239139a616ff90ce16223d
tree0302036c65bfcaef79f74019d49371674ea26376
parent2add6d3fd743ad9d7c4daecdb18b8af203d7d7c4
parent6255b2b820f7d4bd23dc308d056f386e87157122
Merge branch 'devel/home/master'

Conflicts:
data/x11.mobile.480x800.conf.ini
src/event.c

Change-Id: I1c0e9947c7aa5b0df3456ffc0a2ff36d49565c90