Skip to content
Snippets Groups Projects
Commit 4741a7b0 authored by Gabriel Fedel's avatar Gabriel Fedel :speech_balloon:
Browse files

Merge branch 'master' into 'icshwi-8457_housekeeping' 

# Conflicts:
#   configure/CONFIG_MODULE
parents 207b91a8 f410c9ac
No related branches found
No related tags found
1 merge request!30ICSHWI-8457: Housekeeping
Pipeline #103683 failed
Hide whitespace changes
Inline Side-by-side
configure/CONFIG_MODULE
+ 3
− 4
View file @ 4741a7b0
EPICS_MODULE_NAME:=sis8300llrf EPICS_MODULE_NAME:=sis8300llrf
EPICS_MODULE_TAG:=5.5.1 EPICS_MODULE_TAG:=5.6.2
E3_MODULE_VERSION:=5.5.1 E3_MODULE_VERSION:=5.6.2
ASYN_DEP_VERSION=4.41.0 ASYN_DEP_VERSION=4.41.0
LOKI_DEP_VERSION=1.0.0 LOKI_DEP_VERSION=1.0.0
SCALING_DEP_VERSION=1.8.0 SCALING_DEP_VERSION=1.9.0
NDS_DEP_VERSION=2.3.4 NDS_DEP_VERSION=2.3.4
SIS8300DRV_DEP_VERSION=4.10.2 SIS8300DRV_DEP_VERSION=4.10.2
SIS8300_DEP_VERSION=3.5.0 SIS8300_DEP_VERSION=3.5.0
......
sis8300llrf @ b2ce3e50
Compare 02c27f06...b2ce3e50
Subproject commit 02c27f06aab118b9105d5d344921119a8152ec11 Subproject commit b2ce3e50efa4149b185a42aea8a5ef68d526d13c
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment