From 687d1f016d8ba3fabe5c5fe4bd56ab247772def9 Mon Sep 17 00:00:00 2001
From: devilhorns <devilhorns@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Date: Tue, 3 Jul 2012 09:06:43 +0000
Subject: [PATCH] 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
---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

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'
+
-- 
2.7.4