Skip to content

Commit

Permalink
Merge pull request #46 from pcdshub/afs_master
Browse files Browse the repository at this point in the history
Merge in diverging afs/GIT_TOP master
  • Loading branch information
klauer authored May 21, 2020
2 parents 00c7a62 + 5253eff commit cd19ece
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions configure/RELEASE
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ AUTOSAVE_MODULE_VERSION = R5.8-2.1.0
IOCADMIN_MODULE_VERSION = R3.1.15-1.10.0
ASYN_MODULE_VERSION = R4.35-0.0.1
MOTOR_MODULE_VERSION = R6.9-ess-0.0.1
ETHERCATMC_MODULE_VERSION = R2.1.0-0.1.0
ADS_MODULE_VERSION = R2.0.0-0.0.5

ETHERCATMC_MODULE_VERSION = R2.1.0-0.1.2
ADS_MODULE_VERSION = R2.0.0-0.0.6

# ============================================================
# External Support module path definitions
Expand All @@ -34,7 +33,7 @@ MOTOR=$(EPICS_MODULES)/motor/$(MOTOR_MODULE_VERSION)
ASYN=$(EPICS_MODULES)/asyn/$(ASYN_MODULE_VERSION)
ADS=$(EPICS_MODULES)/twincat-ads/$(ADS_MODULE_VERSION)

#MY_MODULES=/reg/neh/home4/mcbrowne/git/modules
#MCB_MODULES=/reg/neh/home4/mcbrowne/git/modules

# ===============================================================
# Define the location and version of EPICS base
Expand Down

0 comments on commit cd19ece

Please sign in to comment.