Merge authors:
  Gruyer Diego (gruyer)
Related merge proposals:
  https://code.launchpad.net/~kaliveda-dev/kaliveda/indra_e613/+merge/108555
  proposed by: Gruyer Diego (gruyer)
  review: Approve - John Frankland (frankland)
------------------------------------------------------------
revno: 627 [merge]
committer: John Frankland <[email protected]>
branch nick: kaliveda
timestamp: Mon 2012-06-04 14:44:51 +0200
message:
  merge#108555
  merge of lp:~kaliveda-dev/kaliveda/indra_e613 rev#548
  this merge brings in:
   * KVCanvas with zoom, pan&scan, function key controls, AGE OF EMPIRE mode!!!
   * CsI R-L grids for E613
added:
  KVMultiDet/gui/KVKeyHandler.cpp
  KVMultiDet/gui/KVKeyHandler.h
  KVMultiDet/identification/KVDroite.cpp
  KVMultiDet/identification/KVDroite.h
  KVMultiDet/identification/KVSpiderIdentificator.cpp
  KVMultiDet/identification/KVSpiderIdentificator.h
  KVMultiDet/identification/KVSpiderLine.cpp
  KVMultiDet/identification/KVSpiderLine.h
  html/images/DocGridEditor.pdf
  html/images/JourneeAnalyse0112_1.pdf
  html/images/JourneeAnalyse0312_1.pdf
modified:
  KVIndra/INDRA_e613/CSI_R_L_e613.dat
  KVMultiDet/Makefile
  KVMultiDet/analysis/KVGausGumDistribution.cpp
  KVMultiDet/analysis/KVGausGumDistribution.h
  KVMultiDet/gui/KVCanvas.cpp
  KVMultiDet/gui/KVCanvas.h
  KVMultiDet/gui/KVIDGridEditor.cpp
  KVMultiDet/gui/KVIDGridEditor.h
  KVMultiDet/gui/KVIDGridEditorCanvas.cpp
  KVMultiDet/gui/KVIDGridEditorCanvas.h
  KVMultiDet/gui/KVIDGridManagerGUI.cpp
  KVMultiDet/gui/KVMultiDetguiLinkDef.h
  KVMultiDet/identification/KVMultiDetidentificationLinkDef.h
  Makefile.general


--
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

Reply via email to