Fork me on GitHub

Ignore:
Timestamp:
Dec 9, 2014, 1:27:13 PM (10 years ago)
Author:
Michele <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
37deb3b, 9e991f8
Parents:
f6b6ee7 (diff), e7e90df (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'TestFastJet310b1'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • external/fastjet/config_auto.h

    rf6b6ee7 r49234af  
    6464#endif
    6565
     66/* defined if demangling is enabled at configure time and is supported through
     67   the GNU C++ ABI */
     68/* #undef HAVE_DEMANGLING_SUPPORT */
     69
    6670/* Define to 1 if you have the <dlfcn.h> header file. */
    6771#ifndef FASTJET_HAVE_DLFCN_H
     
    147151/* Define to the full name and version of this package. */
    148152#ifndef FASTJET_PACKAGE_STRING
    149 #define FASTJET_PACKAGE_STRING  "FastJet 3.0.6"
     153#define FASTJET_PACKAGE_STRING  "FastJet 3.1.0"
    150154#endif
    151155
     
    157161/* Define to the version of this package. */
    158162#ifndef FASTJET_PACKAGE_VERSION
    159 #define FASTJET_PACKAGE_VERSION  "3.0.6"
     163#define FASTJET_PACKAGE_VERSION  "3.1.0"
    160164#endif
    161165
     
    167171/* Version number of package */
    168172#ifndef FASTJET_VERSION
    169 #define FASTJET_VERSION  "3.0.6"
    170 #endif
     173#define FASTJET_VERSION  "3.1.0"
     174#endif
     175
     176/* Major version of this package */
     177#ifndef FASTJET_VERSION_MAJOR
     178#define FASTJET_VERSION_MAJOR  3
     179#endif
     180
     181/* Minor version of this package */
     182#ifndef FASTJET_VERSION_MINOR
     183#define FASTJET_VERSION_MINOR  1
     184#endif
     185
     186/* Version of the package under the form XYYZZ (instead of X.Y.Z) */
     187#ifndef FASTJET_VERSION_NUMBER
     188#define FASTJET_VERSION_NUMBER  30100
     189#endif
     190
     191/* Patch version of this package */
     192#ifndef FASTJET_VERSION_PATCHLEVEL
     193#define FASTJET_VERSION_PATCHLEVEL  0
     194#endif
     195
     196/* Pre-release version of this package */
     197/* #undef VERSION_PRERELEASE */
    171198 
    172199/* once: _INCLUDE_FASTJET_CONFIG_AUTO_H */
Note: See TracChangeset for help on using the changeset viewer.