merged master with work
Change-Id: Iedfb2bf7f28bfe45201adacec0645cc13abffe59
This commit is contained in:
11
README.md
Normal file
11
README.md
Normal 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
|
Reference in New Issue
Block a user