Created bugfix branch v2.6.2 from v2.6.1

Signed-off-by: Christian Muck <christian.muck@bmw.de>

9 files changed, 13 insertions, 10 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e405169..150954d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,9 +23,9 @@ set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )
 # Set version parameters

 set( DLT_MAJOR_VERSION 2)

 set( DLT_MINOR_VERSION 6)

-set( DLT_PATCH_LEVEL 1)

+set( DLT_PATCH_LEVEL 2)

 set( DLT_VERSION ${DLT_MAJOR_VERSION}.${DLT_MINOR_VERSION}.${DLT_PATCH_LEVEL})

-set( DLT_VERSION_STATE RELEASE )

+set( DLT_VERSION_STATE ALPHA )

 set( DLT_REVISION "")

 

 execute_process(COMMAND git describe --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} 

diff --git a/README.txt b/README.txt
index 4a56e68..d0d06d2 100644
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,6 @@
 DLT  - Automotive Diagnostic Log and Trace
 
-Version: 2.6.1
+Version: 2.6.2 ALPHA
 
 This component provides a standardised log and trace interface, based on the
 standardised protocol specified in the AUTOSAR standard 4.0 DLT.
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 3869ba6..7662acc 100755
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,6 +1,6 @@
 DLT - Automotive Diagnostic Log and Trace

 

-Version: 2.6.1

+Version: 2.6.2 ALPHA

 

 This component provides a standardised log and trace interface, based on the

 standardised protocol specified in the AUTOSAR standard 4.0 DLT.

@@ -41,6 +41,9 @@ Christian Muck (christian.muck@bmw.de)
 

 Changes in this release

 -----------------------

+2.6.2

+   * 

+

 2.6.1

 

    * Commented the dlt_log info of buffer size information out

diff --git a/doc/dlt-convert.1 b/doc/dlt-convert.1
index 776183c..d4f8b20 100644
--- a/doc/dlt-convert.1
+++ b/doc/dlt-convert.1
@@ -1,4 +1,4 @@
-.TH dlt-convert 1  "May 8, 2012" "version 2.6.1" "USER COMMANDS"
+.TH dlt-convert 1  "May 8, 2012" "version 2.6.2 ALPHA" "USER COMMANDS"
 .SH NAME
 dlt-convert \- Convert DLT Logging files into ASCII
 .SH SYNOPSIS
diff --git a/doc/dlt-daemon.1 b/doc/dlt-daemon.1
index 861f384..6b57936 100644
--- a/doc/dlt-daemon.1
+++ b/doc/dlt-daemon.1
@@ -1,4 +1,4 @@
-.TH dlt-daemon 1  "May 8, 2012" "version 2.6.1" "USER COMMANDS"
+.TH dlt-daemon 1  "May 8, 2012" "version 2.6.2 ALPHA" "USER COMMANDS"
 .SH NAME
 dlt-daemon \- DLT daemon for logging and tracing purpose
 .SH SYNOPSIS
diff --git a/doc/dlt-receive.1 b/doc/dlt-receive.1
index e052c8d..543cbaa 100644
--- a/doc/dlt-receive.1
+++ b/doc/dlt-receive.1
@@ -1,4 +1,4 @@
-.TH dlt-receive 1  "May 8, 2012" "version 2.6.1" "USER COMMANDS"
+.TH dlt-receive 1  "May 8, 2012" "version 2.6.2 ALPHA" "USER COMMANDS"
 .SH NAME
 dlt-receive \- Console based client for DLT Logging
 .SH SYNOPSIS
diff --git a/doc/dlt-system.1 b/doc/dlt-system.1
index 41c2ca7..e86341b 100644
--- a/doc/dlt-system.1
+++ b/doc/dlt-system.1
@@ -1,4 +1,4 @@
-.TH dlt-system 1  "May 8, 2012" "version 2.6.1" "USER COMMANDS"
+.TH dlt-system 1  "May 8, 2012" "version 2.6.2 ALPHA" "USER COMMANDS"
 .SH NAME
 dlt-system \- DLT system logging process
 .SH SYNOPSIS
diff --git a/doc/dlt-system.conf.5 b/doc/dlt-system.conf.5
index 949b822..09e588f 100644
--- a/doc/dlt-system.conf.5
+++ b/doc/dlt-system.conf.5
@@ -1,4 +1,4 @@
-.TH dlt-system.conf 5  "March 2, 2012" "version 2.6.1 ALPHA" "USER COMMANDS"
+.TH dlt-system.conf 5  "March 2, 2012" "version 2.6.2 ALPHA" "USER COMMANDS"
 .SH NAME
 dlt-system.conf \- DLT system process configuration file
 .SH DESCRIPTION
diff --git a/doc/dlt.conf.5 b/doc/dlt.conf.5
index ce41950..d18f8b3 100644
--- a/doc/dlt.conf.5
+++ b/doc/dlt.conf.5
@@ -1,4 +1,4 @@
-.TH dlt.conf 5  "May 8, 2012" "version 2.6.1" "USER COMMANDS"
+.TH dlt.conf 5  "May 8, 2012" "version 2.6.2 ALPHA" "USER COMMANDS"
 .SH NAME
 dlt.conf \- DLT daemon configuration file
 .SH DESCRIPTION