Fork me on GitHub

Changeset 001ee95 in git


Ignore:
Timestamp:
Jun 6, 2018, 11:09:05 AM (7 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
667a02a
Parents:
fbee3f4 (diff), 748ce07 (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

Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    rfbee3f4 r001ee95  
    23012301        @echo ">> Building $(DISTTAR)"
    23022302        @mkdir -p $(DISTDIR)
    2303         @cp -a CHANGELOG CMakeLists.txt COPYING CREDITS DelphesEnv.sh README README_4LHCb VERSION Makefile MinBias.pileup configure cards classes converters display doc examples external modules python readers validation $(DISTDIR)
     2303        @cp -a AUTHORS CHANGELOG CMakeLists.txt COPYING DelphesEnv.sh LICENSE NOTICE README README_4LHCb VERSION Makefile MinBias.pileup configure cards classes converters display doc examples external modules python readers validation $(DISTDIR)
    23042304        @find $(DISTDIR) -depth -name .\* -exec rm -rf {} \;
    23052305        @tar -czf $(DISTTAR) $(DISTDIR)

  • doc/genMakefile.tcl

    rfbee3f4 r001ee95  
    400400        @echo ">> Building $(DISTTAR)"
    401401        @mkdir -p $(DISTDIR)
    402         @cp -a CHANGELOG CMakeLists.txt COPYING CREDITS DelphesEnv.sh README README_4LHCb VERSION Makefile MinBias.pileup configure cards classes converters display doc examples external modules python readers validation $(DISTDIR)
     402        @cp -a AUTHORS CHANGELOG CMakeLists.txt COPYING DelphesEnv.sh LICENSE NOTICE README README_4LHCb VERSION Makefile MinBias.pileup configure cards classes converters display doc examples external modules python readers validation $(DISTDIR)
    403403        @find $(DISTDIR) -depth -name .\* -exec rm -rf {} \;
    404404        @tar -czf $(DISTTAR) $(DISTDIR)
Note: See TracChangeset for help on using the changeset viewer.