Merge pull request #430 from samoht/master

Update CHANGES
mirage · Mar 31, 2017 · f1430ae · f1430ae
2 parents 55b22dd + 50b8f58
commit f1430ae
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,16 @@
+### 1.0.2 (2017-03-27)
+
+**irmin**
+
+- Add a cstruct type combinator (#429, @samoht)
+- Fix regression introduced in 1.0.1 on merge of base buffers (strings,
+  cstruct). For these types, updates are idempotent, e.g. it is fine
+  if two concurrent branches make the same update. (#429, @samoht)
+
+**irmin-unix**
+
+- Add irminconfig man page (#427, @dudelson)
+
 ### 1.0.1 (2017-03-14)
 
 **irmin**