From: Boram Park <boram1288.park@samsung.com>
Date: Wed, 13 Aug 2014 06:35:34 +0000 (+0900)
Subject: Merge branch 'devel/x11' into tizen
X-Git-Tag: accepted/tizen/3.0/common/20161114.112010^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen_3.0_ivi;p=platform%2Fupstream%2Fxproto.git

Merge branch 'devel/x11' into tizen

Change-Id: I7ba389db96945a8c4599d8486eaf3f945d350091
---

07d1d2afcfd86aaa38a1d34fe1a682a964abe139