From e92ce3549b67944c238942d907e07982fafd45a7 Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Thu, 24 Oct 2013 18:03:01 +0800
Subject: [PATCH] 0.0.12

---
 CHANGES           | 7 +++++++
 tmuxp/__init__.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 76aa36a69c..0d8ac72fc5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,13 @@ Here you can find the recent changes to tmuxp.
   be reimplemented fresh.
 - [cli] check for ``oh-my-zsh`` when using ``$SHELL`` ``zsh``. Prompt if
   ``DISABLE_AUTO_TITLE`` is unset or set to ``true``.
+- [cli] tmuxp can now ``$ tmuxp convert <file>`` from JSON <=> YAML, back
+  and forth.
+- [docs] New examples in JSON. Update the :ref:`examples` page in the
+  docs.
+- [dev] ``.tmuxp.json`` now exists as a config for tmuxp development and
+  as an example.
+
 
 2013-10-23
 ----------
diff --git a/tmuxp/__init__.py b/tmuxp/__init__.py
index 5d76d45957..b5f12ea410 100644
--- a/tmuxp/__init__.py
+++ b/tmuxp/__init__.py
@@ -20,4 +20,4 @@
 
 import logging
 
-__version__ = '0.0.11-dev'
+__version__ = '0.0.12-dev'