merge

pvDataApp/pv/convert.h

@@ -1,10 +1,13 @@
 /* convert.h */
 /**
  * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * EPICS pvData is distributed subject to a Software License Agreement found
  * in file LICENSE that is included with this distribution.
  * Author - Marty Kraimer
  */
+/**
+ *  @author mrk
+ */
 #ifndef CONVERT_H
 #define CONVERT_H
 #include <string>

pvDataApp/pv/pvData.h

@@ -1,9 +1,11 @@
 /* pvData.h */
 /**
  * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * EPICS pvData is distributed subject to a Software License Agreement found
  * in file LICENSE that is included with this distribution.
- * Author - Marty Kraimer
+ */
+/**
+ *  @author mrk
  */
 #ifndef PVDATA_H
 #define PVDATA_H

pvDataApp/pv/pvIntrospect.h

@@ -1,9 +1,11 @@
 /* pvIntrospect.h */
 /**
  * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * EPICS pvData is distributed subject to a Software License Agreement found
  * in file LICENSE that is included with this distribution.
- * Author - Marty Kraimer
+ */
+/**
+ *  @author mrk and Michael Davidsaver
  */
 #ifndef PVINTROSPECT_H
 #define PVINTROSPECT_H

pvDataApp/pv/pvType.h

@@ -1,9 +1,11 @@
 /* pvType.h */
 /**
  * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * EPICS pvData is distributed subject to a Software License Agreement found
  * in file LICENSE that is included with this distribution.
- * Author - Marty Kraimer
+ */
+/**
+ *  @author mrk
  */
 
 /* Definitions for the primitive types for pvData.

pvDataApp/pv/standardField.h

@@ -1,10 +1,13 @@
 /* standardField.h */
 /**
  * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * EPICS pvData is distributed subject to a Software License Agreement found
  * in file LICENSE that is included with this distribution.
  * Author - Marty Kraimer
  */
+/**
+ *  @author mrk
+ */
 #ifndef STANDARDFIELD_H
 #define STANDARDFIELD_H
 #include <string>

pvDataApp/pv/standardPVField.h

@@ -1,9 +1,11 @@
 /* standardPVField.h */
 /**
  * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvDataCPP is distributed subject to a Software License Agreement found
+ * EPICS pvData is distributed subject to a Software License Agreement found
  * in file LICENSE that is included with this distribution.
- * Author - Marty Kraimer
+ */
+/**
+ *  @author mrk
  */
 #ifndef STANDARDPVFIELD_H
 #define STANDARDPVFIELD_H