miriam

5 years ago

6 years ago

171695cc38 merge fixes
ae893b4ebb Merge branch 'kapture2' of http://git.ipe.kit.edu/patrick/KaptureControlGui into kapture2 # Conflicts: # KCG/base/backend/board/actions.py # KCG/base/backend/board/boards_connected.py # KCG/base/backend/board/sequences.py # KCG/base/backend/dataset.py # KCG/base/backend/io.py # KCG/base/backendinterface.py # KCG/base/bitsTable.py # KCG/base/controlwidget.py # KCG/base/groupedelements.py # KCG/base/kcg.py # KCG/base/leftbar.py # KCG/base/log.py # KCG/base/plotWidget.py # KCG/base/storage.py # KCG/config.py # KCG/default_config.cfg # KCG/kcg.py # KCG/widgets/example_widget.py # KCG/widgets/initialconfig.py # KCG/widgets/singleread.py # KCG/widgets/timingWidget.py # kcg.py
512f2a8ccd PV Monitoring working
e5e33220bd Epics -delete PV -Logging updates
28a8108ef0 rename add default epics.cfg
View comparison for these 33 commits »

6 years ago