merged master with work

Change-Id: Iedfb2bf7f28bfe45201adacec0645cc13abffe59
This commit is contained in:
2021-03-03 09:00:45 +01:00
parent fee7c4904b
commit 12b0549cc0
365 changed files with 36809 additions and 11 deletions

11
README.md Normal file
View File

@ -0,0 +1,11 @@
# Frappy Framework
current running code at SINQ, with newest changes not yet pushed
through the Gerrit workflow at MLZ
branches:
- mlz: master from forge.frm2.tum.de:29418/sine2020/secop/playground
- master: the same as above, but with origin: git.psi.ch:sinqdev/frappy.git
- work: current working version, usually in use on /home/l_samenv/frappy (and on neutron instruments)
- wip: current test version, usually in use on /home/l_samenv/frappy_wip