From 16fb0132cec0fcced29bce6d86eaf94a9beb9785 Mon Sep 17 00:00:00 2001
From: Andy Green <andy.green@linaro.org>
Date: Sat, 28 Mar 2015 11:35:40 +0800
Subject: [PATCH] prepare for v1.4

Signed-off-by: Andy Green <andy.green@linaro.org>
---
 CMakeLists.txt             | 2 +-
 changelog                  | 4 ++--
 test-server/test-client.c  | 2 +-
 test-server/test-echo.c    | 2 +-
 test-server/test-fraggle.c | 2 +-
 test-server/test-server.c  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe18b47b..4f8e76c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ project(libwebsockets C)
 set(PACKAGE "libwebsockets")
 set(CPACK_PACKAGE_NAME "${PACKAGE}")
 set(CPACK_PACKAGE_VERSION_MAJOR "1")
-set(CPACK_PACKAGE_VERSION_MINOR "3")
+set(CPACK_PACKAGE_VERSION_MINOR "4")
 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 5e48a24b..b2f4a215 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,8 @@
 Changelog
 ---------
 
-(post-1.3)
-==========
+v1.4-chrome43-firefox36
+=======================
 
 User api additions
 ------------------
diff --git a/test-server/test-client.c b/test-server/test-client.c
index e94dbed6..73cd7d86 100644
--- a/test-server/test-client.c
+++ b/test-server/test-client.c
@@ -268,7 +268,7 @@ int main(int argc, char **argv)
 	memset(&info, 0, sizeof info);
 
 	fprintf(stderr, "libwebsockets test client\n"
-			"(C) Copyright 2010-2013 Andy Green <andy@warmcat.com> "
+			"(C) Copyright 2010-2015 Andy Green <andy@warmcat.com> "
 						    "licensed under LGPL2.1\n");
 
 	if (argc < 2)
diff --git a/test-server/test-echo.c b/test-server/test-echo.c
index 6cbb109b..8f89d10e 100644
--- a/test-server/test-echo.c
+++ b/test-server/test-echo.c
@@ -337,7 +337,7 @@ int main(int argc, char **argv)
 	lws_set_log_level(debug_level, lwsl_emit_syslog);
 #endif
 	lwsl_notice("libwebsockets echo test - "
-		    "(C) Copyright 2010-2014 Andy Green <andy@warmcat.com> - "
+		    "(C) Copyright 2010-2015 Andy Green <andy@warmcat.com> - "
 		    "licensed under LGPL2.1\n");
 #ifndef LWS_NO_CLIENT
 	if (client) {
diff --git a/test-server/test-fraggle.c b/test-server/test-fraggle.c
index fbbe06ef..5faad257 100644
--- a/test-server/test-fraggle.c
+++ b/test-server/test-fraggle.c
@@ -270,7 +270,7 @@ int main(int argc, char **argv)
 	memset(&info, 0, sizeof info);
 
 	fprintf(stderr, "libwebsockets test fraggle\n"
-			"(C) Copyright 2010-2013 Andy Green <andy@warmcat.com> "
+			"(C) Copyright 2010-2015 Andy Green <andy@warmcat.com> "
 						    "licensed under LGPL2.1\n");
 
 	while (n >= 0) {
diff --git a/test-server/test-server.c b/test-server/test-server.c
index 055c3f68..b321ff8c 100644
--- a/test-server/test-server.c
+++ b/test-server/test-server.c
@@ -875,7 +875,7 @@ int main(int argc, char **argv)
 	lws_set_log_level(debug_level, lwsl_emit_syslog);
 
 	lwsl_notice("libwebsockets test server - "
-			"(C) Copyright 2010-2014 Andy Green <andy@warmcat.com> - "
+			"(C) Copyright 2010-2015 Andy Green <andy@warmcat.com> - "
 						    "licensed under LGPL2.1\n");
 
 	printf("Using resource path \"%s\"\n", resource_path);
-- 
GitLab