Michael Davidsaver 875e4db3f9 Merge remote-tracking branch 'launchpad/3.14' ...

* launchpad/3.14:
  missing include

Conflicts:
	src/ioc/dbStatic/dbStaticLib.c

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

..

as

Merge 3.14 version and add 3.15 edits

2016-05-22 14:38:18 +02:00

bpt

Merge 3.14 version and add 3.15 edits

2016-05-22 14:38:18 +02:00

db

Merge changes from 3.14 into 3.15

2017-04-24 18:10:53 -05:00

dbStatic

Merge remote-tracking branch 'launchpad/3.14'

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

dbtemplate

Document -D option to msi

2015-04-14 17:57:10 -05:00

misc

ioc/misc: add dbRecordsAbcSorted to dbCore.dbd

2016-10-07 11:56:06 +02:00

registry

Fix epicsExportSharedSymbols for MinGW build

2014-10-06 00:57:02 -05:00

rsrv

Merged ARCH and bind fixes from 3.14 branch, revno 12696

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

dbCore.rc

Merged changes from 3.14 branch

2013-12-17 12:54:04 -06:00

Makefile

Merge std/*

2011-02-26 18:24:51 -06:00