From 301fbc968f450ceed956d0beac869b5214cf61cc Mon Sep 17 00:00:00 2001
From: Christian Muck <christian.muck@bmw.de>
Date: Fri, 13 Apr 2012 08:58:26 +0200
Subject: Created bugfix branch v2.6.1 from v2.6.0

Signed-off-by: Christian Muck <christian.muck@bmw.de>
---
 CMakeLists.txt        | 4 ++--
 README.txt            | 2 +-
 doc/dlt-convert.1     | 2 +-
 doc/dlt-daemon.1      | 2 +-
 doc/dlt-receive.1     | 2 +-
 doc/dlt-system.1      | 2 +-
 doc/dlt-system.conf.5 | 2 +-
 doc/dlt.conf.5        | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67a4d77..be080d3 100755
--- 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 0)
+set( DLT_PATCH_LEVEL 1)
 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 16dbeb8..4a56e68 100644
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,6 @@
 DLT  - Automotive Diagnostic Log and Trace
 
-Version: 2.6.0
+Version: 2.6.1
 
 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/doc/dlt-convert.1 b/doc/dlt-convert.1
index e61fe76..ddca5fe 100644
--- a/doc/dlt-convert.1
+++ b/doc/dlt-convert.1
@@ -1,4 +1,4 @@
-.TH dlt-convert 1  "March 2, 2012" "version 2.6.0" "USER COMMANDS"
+.TH dlt-convert 1  "March 2, 2012" "version 2.6.1 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 ce68edf..d28901c 100644
--- a/doc/dlt-daemon.1
+++ b/doc/dlt-daemon.1
@@ -1,4 +1,4 @@
-.TH dlt-daemon 1  "March 2, 2012" "version 2.6.0" "USER COMMANDS"
+.TH dlt-daemon 1  "March 2, 2012" "version 2.6.1 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 501ee6d..54d89b2 100644
--- a/doc/dlt-receive.1
+++ b/doc/dlt-receive.1
@@ -1,4 +1,4 @@
-.TH dlt-receive 1  "March 2, 2012" "version 2.6.0" "USER COMMANDS"
+.TH dlt-receive 1  "March 2, 2012" "version 2.6.1 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 cb0e058..6aeb1eb 100644
--- a/doc/dlt-system.1
+++ b/doc/dlt-system.1
@@ -1,4 +1,4 @@
-.TH dlt-system 1  "March 2, 2012" "version 2.6.0" "USER COMMANDS"
+.TH dlt-system 1  "March 2, 2012" "version 2.6.1 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 38c01ef..949b822 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.0" "USER COMMANDS"
+.TH dlt-system.conf 5  "March 2, 2012" "version 2.6.1 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 afa4b22..ba26ef7 100644
--- a/doc/dlt.conf.5
+++ b/doc/dlt.conf.5
@@ -1,4 +1,4 @@
-.TH dlt.conf 5  "March 2, 2012" "version 2.6.0" "USER COMMANDS"
+.TH dlt.conf 5  "March 2, 2012" "version 2.6.1 ALPHA" "USER COMMANDS"
 .SH NAME
 dlt.conf \- DLT daemon configuration file
 .SH DESCRIPTION
-- 
cgit v1.2.1