Der neue Dienst "GitLab am KIT" ist unter gitlab.kit.edu erreichbar.

Skip to content
  • we7765's avatar
    [MERGE] (unix): merge vendor update of 14.5.2015 · ac775d36
    we7765 authored
    Merge branch 'unix' into master
    
    Conflicts:
    	README.md
    	software/calex/calex.doc
    	software/calex/calex.f
    	software/calex/calex10.f
    	software/calex/qcalex.f
    	software/calex/trical.f
    	software/dispcal/dispcal.doc
    	software/dispcal/dispcal.f
    	software/seife/seife.doc
    	software/seife/seife.f
    	software/seife/seife.par
    	software/tiltcal/tiltcal.f
    
    Resolve conflicts manually.
    Most of the conflicts resulted from vendor updates being brought in through
    TFSoftware with merge commit a577f9ae
    A few resulted from manual adjustments done during previous merges of vendor
    updates.
    ac775d36