Michael Davidsaver 8c8604c503 Merge remote-tracking branch 'launchpad/3.14' ...

* launchpad/3.14:
  ioc/dbStatic: dbFreeBase() don't double free alias'd records
  ioc/dbStatic: plug leak in dbFreeBase()
  ioc/dbStatic: whitespace
  Fix indentation warning from GCC
  libCom/test: errlog test more verbose
  libCom: STATIC_ASSERT use c++11 static_assert when possible
  Check for empty PV names in Perl catools

Conflicts:
	src/ioc/dbStatic/dbStaticLib.c
	src/libCom/osi/epicsAssert.h

2017-05-02 18:31:40 -04:00

..

client

Merge remote-tracking branch 'launchpad/3.14'

2017-05-02 18:31:40 -04:00

legacy

Merged ARCH and bind fixes from 3.14 branch, revno 12696

2017-01-23 17:20:51 -06:00