Fork me on GitHub

Ignore:
Timestamp:
Aug 16, 2019, 11:14:50 AM (5 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, master
Children:
0e7d64a
Parents:
94f8f5f (diff), 270bd4f (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 'master' of github.com:delphes/delphes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • external/fastjet/config_auto.h

    r94f8f5f r7692efc  
    6565
    6666/* compile the deprecated parts of the interface using auto-ptr */
    67 #ifndef FASTJET_HAVE_AUTO_PTR_INTERFACE
    68 #define FASTJET_HAVE_AUTO_PTR_INTERFACE  /**/
    69 #endif
     67/* #undef HAVE_AUTO_PTR_INTERFACE */
    7068
    7169/* compiler supports c++14 deprecated keyword */
Note: See TracChangeset for help on using the changeset viewer.