epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge 3.14 branch into 3.15

Browse Source 
# Conflicts:
#	configure/RULES.Db
#	configure/RULES_ARCHS
#	configure/RULES_BUILD
#	documentation/RELEASE_NOTES.html
This commit is contained in:
Andrew Johnson
2017-05-18 17:07:41 -05:00
parent b14d77dcf2 b7b3dd2b37
commit 0b3e44747e
11 changed files with 596 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure/RULES_DIRS
View File

@@ -9,7 +9,7 @@
ARCHS += $(BUILD_ARCHS)
ACTIONS += inc build install buildInstall clean realclean archclean
ACTIONS += runtests tapfiles
ACTIONS += runtests tapfiles junitfiles
dirActionArchTargets = $(foreach dir, $(DIRS), \
$(foreach action, $(ACTIONS), \