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/plugins/SISCone/siscone.h

    rec5e04b rb9ae4c3  
    2222// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //
    2323//                                                                           //
    24 // $Revision:: 369                                                          $//
    25 // $Date:: 2014-09-04 16:57:55 +0200 (Thu, 04 Sep 2014)                     $//
     24// $Revision:: 401                                                          $//
     25// $Date:: 2016-05-19 16:44:37 +0200 (Thu, 19 May 2016)                     $//
    2626///////////////////////////////////////////////////////////////////////////////
    2727
     
    160160 * return SISCone package name.
    161161 * This is nothing but "SISCone", it is a replacement to the
    162  * PACKAGE_NAME string defined in config.h and which is not
    163  * public by default.
     162 * SISCONE_PACKAGE_NAME string defined in config.h and which is not
     163 * guaranteed to be public.
    164164 * \return the SISCone name as a string
    165165 */
Note: See TracChangeset for help on using the changeset viewer.