Commit 596defd4 authored by Lynn Garren's avatar Lynn Garren
Browse files

Merge branch 'develop'

parents 56b2df1b 268c687a
......@@ -31,7 +31,7 @@ cmake_minimum_required(VERSION 2.6)
# project name
project(CLHEP)
set( VERSION 2.2.0.4 )
set( VERSION 2.2.0.5 )
set(CMAKE_MODULE_PATH
${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Cast, 2.2.0.4, http://savannah.cern.ch/projects/clhep/, Cast)
AC_INIT(CLHEP Cast, 2.2.0.5, http://savannah.cern.ch/projects/clhep/, Cast)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/itos.cc])
......
2015-02-09 Lynn Garren <garren@fnal.gov>
* cmake: recognize -std=c++0x, -std=c++11, -std=c++1y, and -std=c++14
* can set CLHEP_BUILD_CXXSTD to one of these flags
* if CLHEP_BUILD_CXXSTD is "ON", then -std=c++11 is used
==============================
10.02.15 Release CLHEP-2.2.0.5
==============================
2015-02-09 Lynn Garren <garren@fnal.gov>
* cmake: recognize -std=c++0x, -std=c++11, -std=c++1y, and -std=c++14
......
==============================
10.02.15 Release CLHEP-2.2.0.5
==============================
==============================
21.11.14 Release CLHEP-2.2.0.4
==============================
==============================
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Evaluator, 2.2.0.4, http://savannah.cern.ch/projects/clhep/, Evaluator)
AC_INIT(CLHEP Evaluator, 2.2.0.5, http://savannah.cern.ch/projects/clhep/, Evaluator)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Evaluator.cc])
......
==============================
10.02.15 Release CLHEP-2.2.0.5
==============================
==============================
21.11.14 Release CLHEP-2.2.0.4
==============================
==============================
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Exceptions, 2.2.0.4, http://savannah.cern.ch/projects/clhep/, Exceptions)
AC_INIT(CLHEP Exceptions, 2.2.0.5, http://savannah.cern.ch/projects/clhep/, Exceptions)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/ZMerrno.cc])
......
==============================
10.02.15 Release CLHEP-2.2.0.5
==============================
==============================
21.11.14 Release CLHEP-2.2.0.4
==============================
==============================
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP Fields, 2.2.0.4, CLHEP@cern.ch, Fields)
AC_INIT(CLHEP Fields, 2.2.0.5, CLHEP@cern.ch, Fields)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/XF.cc])
......
==============================
10.02.15 Release CLHEP-2.2.0.5
==============================
==============================
21.11.14 Release CLHEP-2.2.0.4
==============================
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP GenericFunctions, 2.2.0.4, http://savannah.cern.ch/projects/clhep/, GenericFunctions)
AC_INIT(CLHEP GenericFunctions, 2.2.0.5, http://savannah.cern.ch/projects/clhep/, GenericFunctions)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Abs.cc])
......
==============================
10.02.15 Release CLHEP-2.2.0.5
==============================
==============================
21.11.14 Release CLHEP-2.2.0.4
==============================
==============================
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Geometry, 2.2.0.4, http://savannah.cern.ch/projects/clhep/, Geometry)
AC_INIT(CLHEP Geometry, 2.2.0.5, http://savannah.cern.ch/projects/clhep/, Geometry)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Plane3D.cc])
......
==============================
10.02.15 Release CLHEP-2.2.0.5
==============================
==============================
21.11.14 Release CLHEP-2.2.0.4
==============================
==============================
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Matrix, 2.2.0.4, http://savannah.cern.ch/projects/clhep/, Matrix)
AC_INIT(CLHEP Matrix, 2.2.0.5, http://savannah.cern.ch/projects/clhep/, Matrix)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/DiagMatrix.cc])
......
==============================
10.02.15 Release CLHEP-2.2.0.5
==============================
==============================
21.11.14 Release CLHEP-2.2.0.4
==============================
2014-11-20 Lynn Garren <garren@fnal.gov>
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Random, 2.2.0.4, http://savannah.cern.ch/projects/clhep/, Random)
AC_INIT(CLHEP Random, 2.2.0.5, http://savannah.cern.ch/projects/clhep/, Random)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/DRand48Engine.cc])
......
==============================
10.02.15 Release CLHEP-2.2.0.5
==============================
==============================
21.11.14 Release CLHEP-2.2.0.4
==============================
==============================
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP RandomObjects, 2.2.0.4, http://savannah.cern.ch/projects/clhep/, RandomObjects)
AC_INIT(CLHEP RandomObjects, 2.2.0.5, http://savannah.cern.ch/projects/clhep/, RandomObjects)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/RandMultiGauss.cc])
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP RefCount, 2.2.0.4, http://savannah.cern.ch/projects/clhep/, RefCount)
AC_INIT(CLHEP RefCount, 2.2.0.5, http://savannah.cern.ch/projects/clhep/, RefCount)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/ZMuseCount.cc])
......
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