Updated release notes

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

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index b2494de..9f25ffe 100755 (executable)
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,10 +1,6 @@
 DLT - Automotive Diagnostic Log and Trace\r
 \r
-<<<<<<< HEAD\r
 Version: 2.6.0\r
-=======\r
-Version: 2.5.0\r
->>>>>>> bafb569... Fix merge problems in LM-GENDLT-15\r
 \r
 This component provides a standardised log and trace interface, based on the\r
 standardised protocol specified in the AUTOSAR standard 4.0 DLT.\r
@@ -48,8 +44,34 @@ Changes in this release
 \r
 2.6.0\r
    \r
-   *\r
-   \r
+   * [GDLT-75] Use old style directory check on startup\r
+   * [GENDLT-21] Move mcnt from DltContextData to DltContext\r
+   * [GENDLT-15] Fixes to previous integrations from review\r
+   * [GENDLT-15] Safe re-allocations for databuffer\r
+   * [GENDLT-15] use the correct TEXTBUFSIZE\r
+   * [GENDLT-15] Optimize usege of strlen. Improved log level handling\r
+   * [GENDLT-15] Avoid buffer overrun with snprintf()\r
+   * [GENDLT-15] Check return value of dlt_user_log_write_start(_id) correctly\r
+   * [GENDLT-15] Reduce the number of applications if allocation fails\r
+   * [GENDLT-15] Make dlt_user_log_write_start inline\r
+   * [GENDLT-15] Improve errore checking in dlt_user_log_write_start_id\r
+   * [GENDLT-15] Use databussersize to avoid reallocations\r
+   * [GENDLT-15] Rename buffer size constant to avoid confusion\r
+   * [GENDLT-15] Better error handling when writing to FIFO\r
+   * [GENDLT-15] Remove duplicate msg initialization.\r
+   * [GENDLT-15] Optimize away multiple uses of strlen for one check\r
+   * [GDLT-4] Improve queue handling, allow for other messages while transferring a large file\r
+   * [GDLT-4] Limit maximum file queue to 256 files\r
+   * [GDLT-4] First working version of inotify for file transfer\r
+   * [GDLT-2] First test for filetransfer change\r
+   * [GDLT-2] Change to gzip wrapper format. Change file signature creation to account for file size, as inode number maybe duplicate when deleting and creating new files\r
+   * [GDLT-2] Fix bug while reading the options\r
+   * [GDLT-2] Allow for enabling/disabling compression for the separate directories\r
+   * [GDLT-2] Check if the file is already compressed\r
+   * [GDLT-2] Link with libz, fix a typo\r
+   * [GDLT-2] zlib based compression for dlt-system\r
+   * Cleaned some warnings generated from removing stale old code\r
+\r
 2.5.2\r
 \r
    * Change to Mozilla Public License Version 2.0\r

diff --git a/doc/dlt-convert.1 b/doc/dlt-convert.1
index 9a53804..e61fe76 100644 (file)
--- a/doc/dlt-convert.1
+++ b/doc/dlt-convert.1
@@ -1,4 +1,4 @@
-.TH dlt-convert 1  "March 2, 2012" "version 2.5.1" "USER COMMANDS"
+.TH dlt-convert 1  "March 2, 2012" "version 2.6.0" "USER COMMANDS"
 .SH NAME
 dlt-convert \- Convert DLT Logging files into ASCII
 .SH SYNOPSIS