Skip to content

GitLab

Commit 96dc76ec authored by Lynn Garren's avatar Lynn Garren
Browse files

Merge branch 'release/CLHEP_2_4_0_1'

parents e56c9f2b d51e68b8
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 2 deletions
CMakeLists.txt
View file @ 96dc76ec
......@@ -31,7 +31,7 @@ clhep_ensure_out_of_source_build()
# use cmake 3.2 or later
cmake_minimum_required(VERSION 3.2)
# Project setup
project(CLHEP VERSION 2.4.0.0)
project(CLHEP VERSION 2.4.0.1)
# - needed for (temporary) back compatibility
set(VERSION ${PROJECT_VERSION})
......
ChangeLog
View file @ 96dc76ec
==============================
11.12.17 Release CLHEP-2.4.0.1
==============================
2017-12-11 Lynn Garren <garren@fnal.gov>
* Random/src/MixMaxRng.cc: bug fix for CLHEP-146
==============================
22.11.17 Release CLHEP-2.4.0.0
==============================
......
Evaluator/ChangeLog
View file @ 96dc76ec
==============================
11.12.17 Release CLHEP-2.4.0.1
==============================
==============================
22.11.17 Release CLHEP-2.4.0.0
==============================
==============================
......
Exceptions/ChangeLog
View file @ 96dc76ec
==============================
11.12.17 Release CLHEP-2.4.0.1
==============================
==============================
22.11.17 Release CLHEP-2.4.0.0
==============================
==============================
......
Fields/ChangeLog
View file @ 96dc76ec
==============================
11.12.17 Release CLHEP-2.4.0.1
==============================
==============================
22.11.17 Release CLHEP-2.4.0.0
==============================
==============================
......
GenericFunctions/ChangeLog
View file @ 96dc76ec
==============================
11.12.17 Release CLHEP-2.4.0.1
==============================
==============================
22.11.17 Release CLHEP-2.4.0.0
==============================
==============================
......
Geometry/ChangeLog
View file @ 96dc76ec
==============================
11.12.17 Release CLHEP-2.4.0.1
==============================
==============================
22.11.17 Release CLHEP-2.4.0.0
==============================
==============================
......
Matrix/ChangeLog
View file @ 96dc76ec
==============================
11.12.17 Release CLHEP-2.4.0.1
==============================
==============================
22.11.17 Release CLHEP-2.4.0.0
==============================
==============================
......
Random/ChangeLog
View file @ 96dc76ec
==============================
11.12.17 Release CLHEP-2.4.0.1
==============================
2017-12-11 Lynn Garren <garren@fnal.gov>
* Random/src/MixMaxRng.cc: bug fix for CLHEP-146
==============================
22.11.17 Release CLHEP-2.4.0.0
==============================
......
Random/src/MixMaxRng.cc
View file @ 96dc76ec
......@@ -706,7 +706,7 @@ myuint_t MixMaxRng::apply_bigskip( myuint_t* Vout, myuint_t* Vin, myID_t cluster
myuint_t MixMaxRng::modadd(myuint_t foo, myuint_t bar)
{
#if (defined(__x86_64__) || defined(__i386__)) && defined(__GNUC__) && (!defined(__ICC))
#if defined(__x86_64__) && defined(__GNUC__) && (!defined(__ICC))
//#warning Using assembler routine in modadd
myuint_t out;
/* Assembler trick suggested by Andrzej Görlich */
......
RandomObjects/ChangeLog
View file @ 96dc76ec
==============================
11.12.17 Release CLHEP-2.4.0.1
==============================
==============================
22.11.17 Release CLHEP-2.4.0.0
==============================
==============================
......
Units/ChangeLog
View file @ 96dc76ec
==============================
11.12.17 Release CLHEP-2.4.0.1
==============================
==============================
22.11.17 Release CLHEP-2.4.0.0
==============================
==============================
......
Utility/ChangeLog
View file @ 96dc76ec
==============================
11.12.17 Release CLHEP-2.4.0.1
==============================
==============================
22.11.17 Release CLHEP-2.4.0.0
==============================
==============================
......
Vector/ChangeLog
View file @ 96dc76ec
==============================
11.12.17 Release CLHEP-2.4.0.1
==============================
==============================
22.11.17 Release CLHEP-2.4.0.0
==============================
==============================
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment