commit 34c0173c5e5bc8a6863b795efb64ab2a33ea8b40
parent 856172e18bf867da58300945a236f4d6dd20d720
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Mon, 4 May 2020 11:31:42 +0200
Merge branch 'release_0.0.2'
Diffstat:
8 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/README.md b/README.md
@@ -20,10 +20,11 @@ informations on CMake.
## Licenses
-This is a free software copyright (C) 2018 Centre National de la Recherche
-Scientifique (CNRS), [|Meso|Star](http://www.meso-star.com)
-<contact@meso-star.com>, Université Paul Sabatier
-<contact-edstar@laplace.univ-tlse.fr>. It is released under the GPL v3+
-license: GNU GPL version 3 or later. You are welcome to redistribute it under
-certain conditions; refer to the COPYING file for details.
+Copyright (C) 2018, 2020 [|Meso|Star](http://www.meso-star.com)
+<contact@meso-star.com>. Copyright (C) 2018 Centre National de la Recherche
+Scientifique (CNRS), Université Paul Sabatier
+<contact-edstar@laplace.univ-tlse.fr>. HTMie is free software released under
+the GPL v3+ license: GNU GPL version 3 or later. You are welcome to
+redistribute it under certain conditions; refer to the COPYING file for
+details.
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -1,4 +1,5 @@
-# Copyright (C) 2018 CNRS, |Meso|Star>, Université Paul Sabatier
+# Copyright (C) 2018, 2020 |Meso|Star> (contact@meso-star.com)
+# Copyright (C) 2018 CNRS, Université Paul Sabatier
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -51,7 +52,7 @@ endif()
################################################################################
set(VERSION_MAJOR 0)
set(VERSION_MINOR 0)
-set(VERSION_PATCH 1)
+set(VERSION_PATCH 2)
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
set(HTMIE_FILES_SRC htmie.c)
diff --git a/doc/htmie.5.txt b/doc/htmie.5.txt
@@ -1,4 +1,5 @@
-// Copyright (C) 2018 CNRS, |Meso|Star>, Université Paul Sabatier
+// Copyright (C) 2018, 2020 |Meso|Star> (contact@meso-star.com)
+// Copyright (C) 2018 CNRS, Université Paul Sabatier
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/src/htmie.c b/src/htmie.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2018 CNRS, |Meso|Star>, Université Paul Sabatier
+/* Copyright (C) 2018, 2020 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2018 CNRS, Université Paul Sabatier
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -103,10 +104,10 @@ cmp_dbl(const void* a, const void* b)
}
static INLINE const char*
-ncerr_to_str(const int ncerr)
+ncerr_to_str(const int ncerror)
{
const char* str = "NC_ERR_<UNKNOWN>";
- switch(ncerr) {
+ switch(ncerror) {
case NC_EBADGRPID: str = "NC_EBADGRPID"; break;
case NC_EBADID: str = "NC_EBADID"; break;
case NC_EBADNAME: str = "NC_EBADNAME"; break;
diff --git a/src/htmie.h b/src/htmie.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2018 CNRS, |Meso|Star>, Université Paul Sabatier
+/* Copyright (C) 2018, 2020 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2018 CNRS, Université Paul Sabatier
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_htmie.c b/src/test_htmie.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2018 CNRS, |Meso|Star>, Université Paul Sabatier
+/* Copyright (C) 2018, 2020 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2018 CNRS, Université Paul Sabatier
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_htmie_load.c b/src/test_htmie_load.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2018 CNRS, |Meso|Star>, Université Paul Sabatier
+/* Copyright (C) 2018, 2020 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2018 CNRS, Université Paul Sabatier
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/test_htmie_utils.h b/src/test_htmie_utils.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2018 CNRS, |Meso|Star>, Université Paul Sabatier
+/* Copyright (C) 2018, 2020 |Meso|Star> (contact@meso-star.com)
+ * Copyright (C) 2018 CNRS, Université Paul Sabatier
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
