From fb47c498ef1bed2fd5e8bf5c84427bd7ab410da5 Mon Sep 17 00:00:00 2001
From: Alex Clark <aclark@aclark.net>
Date: Mon, 2 Aug 2010 11:41:21 -0400
Subject: [PATCH] Update HISTORY. Time for 1.2?

---
 docs/HISTORY.txt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
index 0044df95f..e2db01113 100644
--- a/docs/HISTORY.txt
+++ b/docs/HISTORY.txt
@@ -2,11 +2,17 @@
 Changelog
 =========
 
+1.2 - Mon Aug  2 11:39:21 EDT 2010
+----------------------------------
+
+- On OS X also check for freetype2 in the X11 path. [jezdez]
+- Small change in setup.py to output 'Pillow (PIL fork)' text.
+
 1.1 - Sat Jul 31 19:58:33 EDT 2010
 ----------------------------------
 
-- Removed setuptools_hg requirement
-- Clarify the "PIL problem" in README
+- Removed setuptools_hg requirement [aclark]
+- Clarify the "PIL problem" in README [aclark]
 
 
 1.0 - Fri Jul 30 23:12:21 EDT 2010