From ab620ffde36b3186a6392e75d96d8f7016a2b3f6 Mon Sep 17 00:00:00 2001
From: Andy Green <andy.green@linaro.org>
Date: Wed, 28 Oct 2015 08:39:09 +0800
Subject: [PATCH] release v1.5

Signed-off-by: Andy Green <andy.green@linaro.org>
---
 CMakeLists.txt | 2 +-
 changelog      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88ac3d9e..b8058205 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ project(libwebsockets C)
 set(PACKAGE "libwebsockets")
 set(CPACK_PACKAGE_NAME "${PACKAGE}")
 set(CPACK_PACKAGE_VERSION_MAJOR "1")
-set(CPACK_PACKAGE_VERSION_MINOR "4")
+set(CPACK_PACKAGE_VERSION_MINOR "5")
 set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
 set(CPACK_PACKAGE_VENDOR "andy@warmcat.com")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PACKAGE} ${PACKAGE_VERSION}")
diff --git a/changelog b/changelog
index 3290c7a8..62f1ca50 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,8 @@
 Changelog
 ---------
 
-(since last tag)
+v1.5-chrome47-firefox41
+=======================
 
 User api changes
 ----------------
-- 
GitLab