Merge 3.14 version and add 3.15 edits

2016-05-22 14:38:18 +02:00
parent 988614ae8a f4a16a1e1e
commit b9f0ef5158
732 changed files with 100 additions and 1762 deletions
--- a/src/libCom/timer/epicsTimer.cpp
+++ b/src/libCom/timer/epicsTimer.cpp
@@ -7,8 +7,6 @@
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
- *      $Revision-Id$
- *
 *      Author  Jeffrey O. Hill
 *              johill@lanl.gov
 *              505 665 1831