|
|
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 |
|
|
|
36a8b51d8e
|
CleanupWhitespace
removed spaces at end of line
replaced tabs with spaces
|
2020-05-20 14:48:09 -07:00 |
|
|
|
1199fabe90
|
Fix strange compiler errors with gcc 2.96:
using <namespace::function>; seems not to work but
using namespace <namespace>; works
Also 'add' only works with explicit namespace. Why?
|
2018-09-21 16:21:13 +02:00 |
|
Ralph Lange
|
833648c977
|
Move all under modules/libcom
|
2018-06-19 11:25:46 +02:00 |
|