Skip to content

Commit 821de11

Browse files
committed
Merge branch 'master' of https://github.com/endurox-dev/endurox
Conflicts: CMakeLists.txt
2 parents 0ac716d + 14713ef commit 821de11

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
cmake_minimum_required (VERSION 2.6)
3535
project (ENDUROX)
36-
set(VERSION "6.0.5")
36+
set(VERSION "6.0.6")
3737
set(PROJ_NAME "Enduro/X")
3838
set(RELEASE "1")
3939

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,8 @@ Added new command "ps" for xadmin, so that unit tests have unified access to
409409
processing listings across all supported OSes.
410410

411411
- Version 6.0.5 released on 24/12/2018 (development) Feature #366
412+
413+
- Version 6.0.6 released on 08/01/2019 (stable) Marking stable release
412414

413415
# Build configurations
414416

include/atmi_int.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ extern "C" {
232232
__DATE__, __TIME__, ndrx_epoll_mode(), NDRX_BUILD_OS_NAME, sizeof(void *)*8);\
233233
fprintf(stderr, "Enduro/X Middleware Platform for Distributed Transaction Processing\n");\
234234
fprintf(stderr, "Copyright (C) 2009-2016 ATR Baltic Ltd.\n");\
235-
fprintf(stderr, "Copyright (C) 2017,2018 Mavimax Ltd. All Rights Reserved.\n\n");\
235+
fprintf(stderr, "Copyright (C) 2017-2019 Mavimax Ltd. All Rights Reserved.\n\n");\
236236
fprintf(stderr, "This software is released under one of the following licenses:\n");\
237237
fprintf(stderr, "AGPLv3 or Mavimax license for commercial use.\n\n");
238238

0 commit comments

Comments
 (0)