# HG changeset patch
# User Chris Cannam
# Date 1341318354 -3600
# Node ID 90da5af6a9525ddee9825b81086f33dfbfaad304
# Parent  c1451b35609752eb79395ddfbdd9dc879e7fb6f0
Update version number and CHANGELOG

diff -r c1451b356097 -r 90da5af6a952 CHANGELOG
--- a/CHANGELOG	Tue Jul 03 13:11:00 2012 +0100
+++ b/CHANGELOG	Tue Jul 03 13:25:54 2012 +0100
@@ -1,3 +1,15 @@
+
+Changes in v1.2.2 since v1.2.1:
+ * Fix failure to provide IV arg to AES CBC constructor in PyCrypto
+ * Update the history after a failed merge to show the merge
+ * Clear the history while cloning a new repo
+ * Show a sensible error when clone target can't be created
+ * Minor improvements to zooming in history widget
+ * Various other minor fixes
+
+Changes in v1.2.1 since v1.2:
+ * Fix a filesystem watcher bug (affecting OS/X only)
+
 Changes in v1.2 since v1.1:
 
  * Add a Find function to both My Work and History tabs
diff -r c1451b356097 -r 90da5af6a952 src/version.h
--- a/src/version.h	Tue Jul 03 13:11:00 2012 +0100
+++ b/src/version.h	Tue Jul 03 13:25:54 2012 +0100
@@ -1,1 +1,1 @@
-#define EASYHG_VERSION "1.2.1"
+#define EASYHG_VERSION "1.2.2"