kaliveda-dev team mailing list archive
-
kaliveda-dev team
-
Mailing list archive
-
Message #00789
[Branch ~kaliveda-dev/kaliveda/1.8] Rev 698: merge from INDRA-VAMOS development branch lp:~peter-wigg-314159/kaliveda/kaliveda-indraid
Merge authors:
Peter Wigg <pwigg@ccage001>
Peter Wigg <pwigg@ccage002>
Peter Wigg <pwigg@ccage011>
Peter Wigg <pwigg@ccage012>
Peter Wigg <wigg@xxxxxxxx>
Related merge proposals:
https://code.launchpad.net/~peter-wigg-314159/kaliveda/kaliveda-indraid/+merge/129454
proposed by: Peter Wigg (peter-wigg-314159)
review: Approve - John Frankland (frankland)
------------------------------------------------------------
revno: 698 [merge]
committer: John Frankland <frankland@xxxxxxxx>
branch nick: kaliveda
timestamp: Mon 2012-10-15 09:25:10 +0200
message:
merge from INDRA-VAMOS development branch lp:~peter-wigg-314159/kaliveda/kaliveda-indraid
no conflicts, had to add 'using namespace std;' to KVIndra/idtelescopes/KVIDSiCorrCsI_e503.cpp
for compilation with latest versions of ROOT.
added:
KVIndra/idtelescopes/KVIDChIoCorrCsI_e503.cpp
KVIndra/idtelescopes/KVIDChIoCorrCsI_e503.h
KVIndra/idtelescopes/KVIDChIoSiCorr.cpp
KVIndra/idtelescopes/KVIDChIoSiCorr.h
KVIndra/idtelescopes/KVIDSiCorrCsI_e503.cpp
KVIndra/idtelescopes/KVIDSiCorrCsI_e503.h
modified:
KVIndra/INDRA_e503/Grid_ChioCsI_C10-17_R322-606.dat
KVIndra/INDRA_e503/Grid_ChioSi_C4-9_R322-606.dat
KVIndra/INDRA_e503/IDGridManager_E503_CSI_RL.dat
KVIndra/INDRA_e503/IonisationChamber.cal
KVIndra/INDRA_e503/Reconstruction.cal
KVIndra/INDRA_e503/SI_CSI_C4-9_autofit.dat
KVIndra/idtelescopes/KVIndraidtelescopesLinkDef.h
Makefile.general
etc/KaliVeda.rootrc
--
lp:kaliveda
https://code.launchpad.net/~kaliveda-dev/kaliveda/1.8
Your team KaliVeda Development Team is subscribed to branch lp:kaliveda.
To unsubscribe from this branch go to https://code.launchpad.net/~kaliveda-dev/kaliveda/1.8/+edit-subscription