Dirk Zimoch 88cdffddb6 Merge branch '7.0' release 7.4.0.1 into PSI-7.0 ...

Conflicts:
	.gitmodules
	modules/database/src/ioc/db/Makefile
	modules/libcom/test/epicsAtomicTest.cpp
	modules/pvAccess
	modules/pvData
	modules/pvDatabase
	modules/pva2pva

2020-06-03 10:46:07 +02:00

..

src

Merge branch '7.0' release 7.4.0.1 into PSI-7.0

2020-06-03 10:46:07 +02:00

test

Merge branch '7.0' release 7.4.0.1 into PSI-7.0

2020-06-03 10:46:07 +02:00

Makefile

Fix Makefiles to use RULES_DIRS instead of _TOP

2020-05-26 22:09:24 -05:00