From: Changyeon Lee <cyeon.lee@samsung.com>
Date: Thu, 17 Apr 2014 05:39:58 +0000 (+0900)
Subject: Merge branch 'devel/upgrade' into tizen
X-Git-Tag: accepted/tizen/mobile/20140519.075325^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee451f5282674d7d14cf4be48e48701495a80c47;p=platform%2Fupstream%2FlibXi.git

Merge branch 'devel/upgrade' into tizen

Change-Id: I1a8ae7e029a20ee3aeb84d6cb96f1a3443622ab7
Signed-off-by: Changyeon Lee <cyeon.lee@samsung.com>
---

ee451f5282674d7d14cf4be48e48701495a80c47