Skip to content
Snippets Groups Projects
Commit 6cb56ae7 authored by Wayne Lewis's avatar Wayne Lewis
Browse files

Merge branch '202104-e3-env'

parents 12df1a45 7a27708a
No related branches found
Tags 7.0.5-3.4.1/2.9.0-6cb56ae-20210426T180343
No related merge requests found
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
EPICS_BASE:=/epics/base-7.0.5 EPICS_BASE:=/epics/base-7.0.5
E3_REQUIRE_NAME:=require E3_REQUIRE_NAME:=require
E3_REQUIRE_VERSION:=3.4.0 E3_REQUIRE_VERSION:=3.4.1
# The definitions shown below can also be placed in an untracked RELEASE.local # The definitions shown below can also be placed in an untracked RELEASE.local
-include $(TOP)/../../RELEASE.local -include $(TOP)/../../RELEASE.local
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment