linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,894 Commits 1 Branch 0 Tags
4c3b3f71e5d669464a125f05a29191e49e949819
Commit Graph

2 Commits

Author SHA1 Message Date
Douglas Clowes
c3bb4a9591 Merge branch 'RELEASE-3_1' into RELEASE-3_2 
Conflicts:
	sics/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
 2015-01-07 13:09:27 +11:00
Douglas Clowes
679838eac3 Port new Aerolas Doppler driver from RELEASE-3_1 2015-01-07 10:29:07 +11:00