From 21dca093d0b25ac7c2313c48d9d164ce49cf88ca Mon Sep 17 00:00:00 2001
From: Christopher Michael <cpmichael1@comcast.net>
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.



SVN revision: 73213
---
 legacy/evas/ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/legacy/evas/ChangeLog b/legacy/evas/ChangeLog
index 860ce218b1..45d793e664 100644
--- a/legacy/evas/ChangeLog
+++ b/legacy/evas/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'
+