From 04fe34c4c987a7b659d85fc83c9b170cd3eefef8 Mon Sep 17 00:00:00 2001
From: novacrazy <novacrazy@gmail.com>
Date: Thu, 23 Aug 2018 20:59:20 -0500
Subject: [PATCH] Update CHANGELOG and bump version

---
 CHANGELOG.md | 16 ++++++++++------
 Cargo.toml   |  6 +++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1550e2727..705fe30882 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,12 @@
-* **0.11.0**
-    * Redesign `GenericSequence` with an emphasis on use in generic type parameters.
+* **`0.12.0`**
+    * Allow trailing commas in `arr!` macro.
+    * **BREAKING**: Serialize `GenericArray` using `serde` tuples, instead of variable-length sequences. This may not be compatible with old serialized data.
+
+* **`0.11.0`**
+    * **BREAKING** Redesign `GenericSequence` with an emphasis on use in generic type parameters.
     * Add `MappedGenericSequence` and `FunctionalSequence`
         * Implements optimized `map`, `zip` and `fold` for `GenericArray`, `&GenericArray` and `&mut GenericArray`
-    * Remove `map_ref`, `zip_ref` and `map_slice`
+    * **BREAKING** Remove `map_ref`, `zip_ref` and `map_slice`
         * `map_slice` is now equivalent to `GenericArray::from_iter(slice.iter().map(...))`
 * **`0.10.0`**
     * Add `GenericSequence`, `Lengthen`, `Shorten`, `Split` and `Concat` traits.
@@ -17,13 +21,13 @@
     * Update `typenum`
     * Make macro `arr!` non-cloning
     * Implement `From<[T; N]>` up to `N=32`
-    * Fix #45 
+    * Fix #45
 * **`0.7.0`**
     * Upgrade `serde` to `0.9`
     * Make `serde` with `no_std`
     * Implement `PartialOrd`/`Ord` for `GenericArray`
 * **`0.6.0`**
-    * Fixed #30 
+    * Fixed #30
     * Implement `Default` for `GenericArray`
     * Implement `LowerHex` and `UpperHex` for `GenericArray<u8, N>`
     * Use `precision` formatting field in hex representation
@@ -33,7 +37,7 @@
     * `no_std` and `core` for crate.
 * **`0.5.0`**
     * Update `serde`
-    * remove `no_std` feature, fixed #19 
+    * remove `no_std` feature, fixed #19
 * **`0.4.0`**
     * Re-export `typenum`
 * **`0.3.0`**
diff --git a/Cargo.toml b/Cargo.toml
index 678af203d8..bfc8037634 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "generic-array"
-version = "0.11.1"
+version = "0.12.0"
 authors = [ "Bartłomiej Kamiński <fizyk20@gmail.com>", "Aaron Trent <novacrazy@gmail.com>" ]
 
 description = "Generic types implementing functionality of arrays"
@@ -22,10 +22,10 @@ travis-ci = { repository = "fizyk20/generic-array" }
 name = "generic_array"
 
 [dependencies]
-typenum = "1.9"
+typenum = "1.10"
 serde = { version = "1.0", optional = true, default-features = false }
 
 [dev_dependencies]
 # this can't yet be made optional, see https://github.com/rust-lang/cargo/issues/1596
 serde_json = "1.0"
-bincode = "1.0.1"
\ No newline at end of file
+bincode = "1.0"
\ No newline at end of file