Fork me on GitHub

Changeset 83e60eb in git


Ignore:
Timestamp:
Jun 9, 2016, 9:43:39 AM (8 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
abab212, bd0a1aa
Parents:
0a6c72b (diff), 7955405 (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:
2 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r0a6c72b r83e60eb  
    21082108        @rm $@.arch $@.base
    21092109
    2110 %Dict$(PcmSuf):
     2110$(DELPHES_DICT_PCM): %Dict$(PcmSuf):
     2111        @echo ">> Copying $@"
     2112        @cp $< $@
     2113
     2114$(FASTJET_DICT_PCM): %Dict$(PcmSuf):
     2115        @echo ">> Copying $@"
     2116        @cp $< $@
     2117
     2118$(DISPLAY_DICT_PCM): %Dict$(PcmSuf):
    21112119        @echo ">> Copying $@"
    21122120        @cp $< $@
  • doc/genMakefile.tcl

    r0a6c72b r83e60eb  
    419419        @rm $@.arch $@.base
    420420
    421 %Dict$(PcmSuf):
     421$(DELPHES_DICT_PCM): %Dict$(PcmSuf):
     422        @echo ">> Copying $@"
     423        @cp $< $@
     424
     425$(FASTJET_DICT_PCM): %Dict$(PcmSuf):
     426        @echo ">> Copying $@"
     427        @cp $< $@
     428
     429$(DISPLAY_DICT_PCM): %Dict$(PcmSuf):
    422430        @echo ">> Copying $@"
    423431        @cp $< $@
Note: See TracChangeset for help on using the changeset viewer.