From: devilhorns <devilhorns@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Date: Tue, 3 Jul 2012 09:06:43 +0000 (+0000)
Subject: Evas: Update ChangeLog wrt Tizen Merge.
X-Git-Tag: submit/trunk/20120815.174732~137
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=687d1f016d8ba3fabe5c5fe4bd56ab247772def9;p=profile%2Fivi%2Fevas.git

Evas: Update ChangeLog wrt Tizen Merge.

NB: This is the commit message inside tizen git for this commit. Don't
blame me if the message is not detailed enough for you. Complain to
the original committer about making more detailed commit messages.



git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@73213 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---

diff --git a/ChangeLog b/ChangeLog
index 860ce21..45d793e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -837,3 +837,8 @@
 
         * Fix font instance refcounting for textprops that hang around.
 
+2012-06-29  Jiyoun Park
+
+	* upstream merge
+	* Merge remote-tracking branch 'remotes/origin/upstream'
+