diff --git a/CMakeLists.txt b/CMakeLists.txt index fe18b47b440c07271ced8191e9046b89301fcfb5..4f8e76c6754b0f549244de92b3c5d1f9f88457e1 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 5e48a24b6cbde0e1c31635c2aa9bbe67282e0f5e..b2f4a2159ba0e21a5426e29c1568bccb3892ac16 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 e94dbed6784344508e0cfaa8e6e5a5acbbd0a68f..73cd7d86abfd1f950712365032f801c0fd896c3c 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 6cbb109b8d5cde9c11d1b91c7e18e1955147df0a..8f89d10ef4538f58f6cdbea2729409b02593a183 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 fbbe06efcd87347a74b4eac8729e6a93d9c1ee38..5faad25729efd9b6e47a546a86545af091645093 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 055c3f68f0e317767a934edfc9c3e6d600f70767..b321ff8c8e2fabffd7917f848c77f7d80dd35e5a 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);