reset dev branch for work on next version

This commit is contained in:
Peter Thorson committed 2015-06-02 08:59:10 -04:00
1 parent f931734369
commit 39497aaa61
4 files changed
+6 -6

No files matched your search

+1 -1
View File
@@ -9,7 +9,7 @@ project (websocketpp)
cmake_minimum_required (VERSION 2.6)
set (WEBSOCKETPP_MAJOR_VERSION 0)
set (WEBSOCKETPP_MINOR_VERSION 6)
set (WEBSOCKETPP_MINOR_VERSION 7)
set (WEBSOCKETPP_PATCH_VERSION 0)
set (WEBSOCKETPP_VERSION ${WEBSOCKETPP_MAJOR_VERSION}.${WEBSOCKETPP_MINOR_VERSION}.${WEBSOCKETPP_PATCH_VERSION})
+1 -1
View File
@@ -33,7 +33,7 @@ PROJECT_NAME = "websocketpp"
# if some version control system is used.
PROJECT_NUMBER = "0.6.0"
PROJECT_NUMBER = "0.7.x-dev"
# Using the PROJECT_BRIEF tag one can provide an optional one line description
+1 -1
View File
@@ -1,4 +1,4 @@
WebSocket++ (0.6.0)
WebSocket++ (0.7.x-dev)
==========================
WebSocket++ is a header only C++ library that implements RFC6455 The WebSocket
+3 -3
View File
@@ -42,7 +42,7 @@ namespace websocketpp {
/// Library major version number
static int const major_version = 0;
/// Library minor version number
static int const minor_version = 6;
static int const minor_version = 7;
/// Library patch version number
static int const patch_version = 0;
/// Library pre-release flag
@@ -50,10 +50,10 @@ static int const patch_version = 0;
* This is a textual flag indicating the type and number for pre-release
* versions (dev, alpha, beta, rc). This will be blank for release versions.
*/
static char const prerelease_flag[] = "";
static char const prerelease_flag[] = "dev";
/// Default user agent string
static char const user_agent[] = "WebSocket++/0.6.0";
static char const user_agent[] = "WebSocket++/0.7.x-dev";
} // namespace websocketpp