Merge authors: e613 <e613@ganp1010> e613 <e613@ganp1012> e613 <e613@ganp736> e613 <e613@ganp737> eindra2 <eindra2@ganp736>...
Related merge proposals: https://code.launchpad.net/~kaliveda-dev/kaliveda/kalivedagru/+merge/79383 proposed by: John Frankland (frankland) review: Approve - John Frankland (frankland) ------------------------------------------------------------ revno: 471 [merge] committer: e613 <e613@ganp1010> branch nick: kaliveda timestamp: Fri 2011-10-14 14:49:56 +0200 message: merge of lp:kaliveda/kalivedagru conflicts resolved all 'GRU' based stuff is commented in KaliVedaGUI: revert to non-host-dependent TEnv file and show "file written" datime added: KVIndra/INDRA_e613/ChIoPressures.dat KVIndra/INDRA_e613/piedestal_CSI.dat KVIndra/analysis/KVINDRAOnlineDataAnalyser.cpp KVIndra/analysis/KVINDRAOnlineDataAnalyser.h KVMultiDet/daq_cec/KVGRUNetClientGanilReader.cpp KVMultiDet/daq_cec/KVGRUNetClientGanilReader.h modified: KVIndra/INDRA_e613/Runlist.csv KVIndra/INDRA_e613/Systems.dat KVIndra/KVIndraLinkDef.h KVIndra/Makefile KVIndra/gui/KVDataAnalysisLauncher.cpp KVMultiDet/KVMultiDetLinkDef.h KVMultiDet/Makefile KVMultiDet/analysis/KVRawDataAnalyser.cpp KVMultiDet/analysis/KVRawDataAnalyser.h KVMultiDet/base/KVBase.cpp KVMultiDet/base/KVBase.h KVMultiDet/daq_cec/GTGanilData.h KVMultiDet/daq_cec/GTOneScaler.h KVMultiDet/db/KVDBSystem.cpp KVMultiDet/gui/KVDBSystemDialog.cpp KVMultiDet/gui/KVIDGridManagerGUI.cpp KVMultiDet/gui/KVIDGridManagerGUI.h KVMultiDet/gui/KVLVContainer.cpp KVMultiDet/gui/KVLVContainer.h KVMultiDet/gui/KVListView.h KVMultiDet/identification/KVTGIDFitter.cpp KVMultiDet/identification/KVTGIDGrid.cpp KVMultiDet/identification/KVTGIDGrid.h KVMultiDet/idmaps/KVIDGraph.cpp KVMultiDet/idmaps/KVIDGraph.h Makefile analysis/Makefile 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 _______________________________________________ Mailing list: https://launchpad.net/~kaliveda-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~kaliveda-dev More help : https://help.launchpad.net/ListHelp
