From 18c69c998d0cb384abf518c99db2979a35ff15df Mon Sep 17 00:00:00 2001
From: vitaut <victor.zverovich@gmail.com>
Date: Mon, 11 Apr 2016 15:13:36 -0400
Subject: [PATCH] Update changelog and version

---
 CMakeLists.txt |  2 +-
 ChangeLog.rst  | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f326726c..7e95428c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ option(FMT_USE_CPP11 "Enable the addition of C++11 compiler flags." ON)
 project(FORMAT)
 
 # starting with cmake 3.0 VERSION is part of the project command
-set(CPPFORMAT_VERSION 2.1.0)
+set(CPPFORMAT_VERSION 2.1.1)
 if (NOT CPPFORMAT_VERSION MATCHES "^([0-9]+).([0-9]+).([0-9]+)$")
   message(FATAL_ERROR "Invalid version format ${CPPFORMAT_VERSION}.")
 endif ()
diff --git a/ChangeLog.rst b/ChangeLog.rst
index 4aba2df9..9b83bec9 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,3 +1,13 @@
+2.1.1 - TBD
+-----------
+
+* The install location for generated CMake files is now configurable via
+  the ``FMT_CMAKE_DIR`` CMake variable
+  (`#299 <https://github.com/cppformat/cppformat/pull/299>`_).
+  Thanks to `@niosHD <https://github.com/niosHD>`_.
+
+* Documentation fixes (`#252 <https://github.com/cppformat/cppformat/issues/252>`_).
+
 2.1.0 - 2016-03-21
 ------------------