discomfitor pushed a commit to branch evas-1.7.
commit 9140154df3ac2d45d0abc5ef209191429ecdf206
Author: Mike Blumenkrantz <[email protected]>
Date: Mon Apr 22 17:32:44 2013 +0100
remove harmless merge failure line
---
ChangeLog | 1 -
1 file changed, 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 977f1f5..ec35d8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1237,7 +1237,6 @@
* Fix crash in Evas Buffer engine when using output without alpha
channel.
-<<<<<<< HEAD
2013-04-04 Tom Hacohen
* Evas font: If OS/2 table is available and the font is demi-bold,
--
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
