Andrew Johnson 43ea188385 Merge 3.15 branch into 3.16 ...

# Conflicts:
#	configure/CONFIG_BASE
#	configure/RULES_BUILD

2017-05-18 17:10:40 -05:00

..

os

Merge remote-tracking branch 'launchpad/3.15'

2017-04-21 16:16:03 -04:00

CONFIG

Merge 3.14 version and add 3.15 edits

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

CONFIG_ADDONS

Merge 3.14 version and add 3.15 edits

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

CONFIG_APP_INCLUDE

Merge 3.14 version and add 3.15 edits

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

CONFIG_BASE

Merge 3.15 branch into 3.16

2017-05-18 17:10:40 -05:00

CONFIG_BASE_VERSION

Set snapshot to -rc1-DEV

2017-05-09 14:45:55 -05:00

CONFIG_COMMON

Merged changes from 3.15 branch, to revno 12781

2016-09-07 10:04:54 -05:00

CONFIG_ENV

EPICS_CA_AUTO_MAX_ARRAY_BYTES -> EPICS_CA_AUTO_ARRAY_BYTES

2017-05-03 13:59:35 -04:00

CONFIG_FILE_TYPE

Merge 3.14 version and add 3.15 edits

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

CONFIG_SITE

Merge 3.14 branch into 3.15

2017-05-18 17:07:41 -05:00

CONFIG_SITE_ENV

Merged changes from 3.15 branch, to revno 12781

2016-09-07 10:04:54 -05:00

CONFIG.CrossCommon

MS build config updates, suppress warning C4344

2016-08-17 11:19:15 -05:00

CONFIG.gnuCommon

Merge 3.14 version and add 3.15 edits

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

Makefile

Merge 3.14 version and add 3.15 edits

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

RELEASE

Update comments in the configure/RELEASE file

2017-05-11 14:50:00 -05:00

RULES

Removed Revision-Id from configure; still one Date

2016-05-21 04:27:03 +02:00

RULES_ARCHS

Merge 3.14 branch into 3.15

2017-05-18 17:07:41 -05:00

RULES_BUILD

Merge 3.15 branch into 3.16

2017-05-18 17:10:40 -05:00

RULES_DIRS

Merge 3.14 branch into 3.15

2017-05-18 17:07:41 -05:00

RULES_EXPAND

Merged changes from 3.14 branch to revo 12652

2016-07-21 23:37:54 -05:00

RULES_FILE_TYPE

Merge 3.14 version and add 3.15 edits

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

RULES_OCTAVE

Merge 3.14 version and add 3.15 edits

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

RULES_TARGET

Merge 3.14 version and add 3.15 edits

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

RULES_TOP

Merge 3.14 branch into 3.15

2017-05-18 17:07:41 -05:00

RULES.Db

Merge 3.15 branch into 3.16

2017-05-18 17:10:40 -05:00

RULES.ioc

Merged ARCH and bind fixes from 3.14 branch, revno 12696

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

Sample.Makefile

Fixed file permissions.

2013-08-19 13:30:19 -05:00