Changeset d870fc5 in git for classes/DelphesStream.h

Timestamp:

Dec 21, 2014, 4:03:35 PM (10 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

d77b51d

Parents:

7f12612 (diff), e5767b57 (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 remote-tracking branch 'upstream/master'

File:

• classes/DelphesStream.h (modified) (2 diffs)

classes/DelphesStream.h

@@ -2 +2 @@
  *  Delphes: a framework for fast simulation of a generic collider experiment
  *  Copyright (C) 2012-2014  Universite catholique de Louvain (UCL), Belgium
- *  
+ *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -23 +23 @@
  *
  *  Provides an interface to manipulate c strings as if they were input streams
- *
- *
- *  $Date: 2012-11-15 13:57:55 $
- *  $Revision: 1.1 $
- *
  *
  *  \author P. Demin - UCL, Louvain-la-Neuve