Merge branch '1.2'

[jansson.git] / CHANGES

diff --git a/CHANGES b/CHANGES
index 4bba484..dcbf6a0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,17 @@
-Version 1.2 (in development)
+Version 1.3 (in development)
 ============================
 
+* New encoding flags:
+
+  - ``JSON_PRESERVE_ORDER``: Preserve the insertion order of object
+    keys.
+
+
+Version 1.2
+===========
+
+Released 2010-01-21
+
 * New functions:
 
   - `json_equal()`: Test whether two JSON values are equal