Fork me on GitHub

Ignore:
Timestamp:
Jun 8, 2018, 3:23:13 PM (6 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
e57c062
Parents:
001ee95 (diff), 17d0ab8 (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

Location:
external/fastjet/plugins/ATLASCone
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • external/fastjet/plugins/ATLASCone/ATLASConePlugin.cc

    r001ee95 r667a02a  
    11//FJSTARTHEADER
    2 // $Id: ATLASConePlugin.cc 3433 2014-07-23 08:17:03Z salam $
     2// $Id: ATLASConePlugin.cc 4354 2018-04-22 07:12:37Z salam $
    33//
    4 // Copyright (c) 2007-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2007-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------

  • external/fastjet/plugins/ATLASCone/fastjet/ATLASConePlugin.hh

    r001ee95 r667a02a  
    11//FJSTARTHEADER
    2 // $Id: ATLASConePlugin.hh 3433 2014-07-23 08:17:03Z salam $
     2// $Id: ATLASConePlugin.hh 4354 2018-04-22 07:12:37Z salam $
    33//
    4 // Copyright (c) 2007-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     4// Copyright (c) 2007-2018, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
    55//
    66//----------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.