merge

2012-09-03 23:46:06 +02:00
parent 516518529c 6b4eb1a1b0
commit cfc9ebefb0
94 changed files with 409 additions and 100 deletions
--- a/pvDataApp/factory/Convert.cpp
+++ b/pvDataApp/factory/Convert.cpp
@@ -1,9 +1,12 @@
 /* Convert.cpp */
 /**
 * 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 mrk
+ */
 #include <cstdio>
 #include <string>
 #include <vector>