Fork me on GitHub

Ignore:
Timestamp:
Sep 2, 2016, 3:46:14 PM (8 years ago)
Author:
GitHub <noreply@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
fa068d3
Parents:
ec5e04b (diff), 23389ff (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.
git-author:
Pavel Demin <pavel-demin@…> (09/02/16 15:46:14)
git-committer:
GitHub <noreply@…> (09/02/16 15:46:14)
Message:

Merge pull request #32 from delphes/dev_01

Dev 01

File:
1 edited

Legend:

Unmodified
Added
Removed
  • external/fastjet/tools/Subtractor.hh

    rec5e04b rb9ae4c3  
    11//FJSTARTHEADER
    2 // $Id: Subtractor.hh 3670 2014-09-08 14:17:59Z soyez $
     2// $Id: Subtractor.hh 3970 2015-09-21 10:31:17Z salam $
    33//
    44// Copyright (c) 2005-2014, Matteo Cacciari, Gavin P. Salam and Gregory Soyez
     
    203203  static const double _invalid_rho;
    204204
    205   mutable LimitedWarning _unused_rho_m_warning;
     205  static LimitedWarning _unused_rho_m_warning;
    206206};
    207207
Note: See TracChangeset for help on using the changeset viewer.