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

..

ca

Merge remote-tracking branch 'launchpad/3.14'

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

ioc

Merge remote-tracking branch 'launchpad/3.14'

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

libCom

Merge remote-tracking branch 'launchpad/3.14'

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

std

Merge remote-tracking branch 'launchpad/3.14'

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

template

Merged changes from 3.14 branch to revno 12687

2016-12-07 16:36:58 -06:00

tools

Merged Windows fixes from 3.14 branch, to revno 12699

2017-01-30 14:31:04 -06:00

Makefile

Merge 3.14 version and add 3.15 edits

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