From: Boram Park <boram1288.park@samsung.com>
Date: Wed, 30 Jul 2014 09:11:29 +0000 (+0900)
Subject: Merge branch 'devel/x11' into tizen
X-Git-Tag: submit/tizen/20140818.084211^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen;p=platform%2Fupstream%2Finputproto.git

Merge branch 'devel/x11' into tizen

Change-Id: I904c188af1a7ce8fe715f2623d5f89a1493dc6b9
---

516e70d1b141ef74dcfb446ccf6f1ef69957f75c