-
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