|
|
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 |
|
Andrew Johnson
|
5009f288ae
|
Generate module version files with new RULES_EXPAND facilities
Also removes the separate *VersionNum.h@ templates
|
2020-03-20 12:03:14 -05:00 |
|
Andrew Johnson
|
0cf38bfb29
|
Try out a representative sample of APIs from multiple libraries
|
2020-03-07 01:32:36 -06:00 |
|
|
|
86adc529ef
|
Merge remote-tracking branch 'origin' into PSI-7.0
Conflicts:
configure/os/CONFIG_SITE.Common.linuxCommon
modules/libcom/src/log/iocLog.c
modules/libcom/src/log/logClient.c
modules/pvAccess
modules/pvData
modules/pvDatabase
|
2020-02-06 17:28:40 +01:00 |
|
Andrew Johnson
|
171b3301a7
|
Fix ..// => ../ in Makefile-relative source paths
|
2019-10-28 15:00:15 -05:00 |
|
|
|
7889dda6f8
|
merged with upstream
|
2019-02-20 10:51:02 +01:00 |
|
Michael Davidsaver
|
49b323b93c
|
avoided embedded TOP for non sub-modules
|
2019-01-03 20:17:58 -08:00 |
|
Andrew Johnson
|
8481ae3787
|
Set embedded modules' SHRLIB_VERSION from CONFIG variables
|
2018-12-17 17:19:10 -06:00 |
|
|
|
7738b68320
|
fix missing template instances for old vxWorks (uses -fno-implicit-templates)
|
2018-09-24 18:00:53 +02:00 |
|
Ralph Lange
|
e165567234
|
Move all under modules/ca
|
2018-06-19 11:33:25 +02:00 |
|
