merge with master 38/9038/1
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:03:36 +0000 (01:03 +0900)
committerBoram Park <boram1288.park@samsung.com>
Mon, 2 Sep 2013 08:05:32 +0000 (17:05 +0900)
commit9b2d1b00b9904c62ed08718e6d794c4b5de9c4e6
treefba89415226008d4f74a046dcf03adac2c642684
parent58c8c27aee9398f53573a41b0616f3fabbc1cbb9
merge with master

Change-Id: I71be12d564da18c5648b840a181f3dc31680dffa
common/xinitrc
conf-arm-emulfb/input.conf
conf-arm-emulfb/module.conf [new file with mode: 0644]
conf-i386-emulfb/input.conf
conf-i386-emulfb/module.conf [new file with mode: 0644]
packaging/xorg-x11-misc.spec
xorg-x11-misc-arm-common.manifest
xorg-x11-misc-i386-common.manifest