From 1e867a87e81c225e210eed35d016c344abfed75f Mon Sep 17 00:00:00 2001
From: Mikkel Krautz <mikkel@krautz.dk>
Date: Mon, 12 Dec 2016 21:12:12 +0100
Subject: Update changelog.

---
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index c8b85ecf2..85ebe982e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 2016-12-12
   Mikkel Krautz <mikkel@krautz.dk>
+    d2ca2e7  Bump version to 1.2.18.
+    aa7ce92  Update changelog.
     f6cd2e6  Revert db940d1bad5929c1; backport cplusplus.pri from master
 	     instead.
 
-- 
cgit v1.2.3