Merge remote-tracking branch 'origin' into iocsh (22739fe2) · Commits · synApps_6_1_Working / xxx-R6-1 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

X

xxx-R6-1
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Releases
- Model registry
- Incidents

Snippets Groups Projects

22739fe2

Commit 22739fe2 authored 7 years ago by klang

Downloads
- Plain Diff

Merge remote-tracking branch 'origin' into iocsh

Conflicts:
	iocBoot/iocxxx/softioc/xxx.sh

parents f0ef6454 3d5e2fd8

No related branches found

No related tags found

No related merge requests found

Changes 20

Hide whitespace changes

Inline Side-by-side

Showing

EXAMPLE_start_caQtDM.sh 47 additions, 38 deletions

EXAMPLE_start_caQtDM.sh
README.md 5 additions, 0 deletions

README.md
configure/CONFIG_SITE 2 additions, 0 deletions

configure/CONFIG_SITE
configure/RELEASE 4 additions, 3 deletions

configure/RELEASE
documentation/README.md 5 additions, 0 deletions

documentation/README.md
iocBoot/iocxxx/softioc/xxx.sh 6 additions, 5 deletions

iocBoot/iocxxx/softioc/xxx.sh
release.pl 2 additions, 1 deletion

release.pl
setup_epics_common 160 additions, 5 deletions

setup_epics_common
start_caQtDM 9 additions, 122 deletions

start_caQtDM
start_caQtDM-3-8-10_APSshare 0 additions, 130 deletions

start_caQtDM-3-8-10_APSshare
start_caQtDM-4.0.0_APSshare 0 additions, 130 deletions

start_caQtDM-4.0.0_APSshare
start_caQtDM_APSshare 0 additions, 139 deletions

start_caQtDM_APSshare
start_epics_xxx.bash 1 addition, 1 deletion

start_epics_xxx.bash
xxxApp/op/adl/xxx.adl 243 additions, 71 deletions

xxxApp/op/adl/xxx.adl
xxxApp/op/opi/xxx.opi 9 additions, 1 deletion

xxxApp/op/opi/xxx.opi
xxxApp/op/ui/.gitignore 0 additions, 0 deletions

xxxApp/op/ui/.gitignore
xxxApp/op/ui/autoconvert/.gitignore 0 additions, 0 deletions

xxxApp/op/ui/autoconvert/.gitignore
xxxApp/op/ui/autoconvert/Security_Control.ui 0 additions, 0 deletions

xxxApp/op/ui/autoconvert/Security_Control.ui
xxxApp/op/ui/autoconvert/xxx.ui 3 additions, 3 deletions

xxxApp/op/ui/autoconvert/xxx.ui
xxxApp/src/Makefile 2 additions, 0 deletions

xxxApp/src/Makefile

with 498 additions and 649 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment