merge feature/changesAfter3_0_2; resolve conflicts

2014-06-10 15:53:37 -04:00
parent 35429bf4df
commit 92be294bbf
87 changed files with 561 additions and 445 deletions
--- a/exampleLink/src/exampleLink.cpp
+++ b/exampleLink/src/exampleLink.cpp
@@ -9,13 +9,10 @@
 * @date 2013.08.02
 */

+#include <pv/exampleLink.h>
 #include <pv/standardPVField.h>
 #include <pv/convert.h>

-#define epicsExportSharedSymbols 
-#include <exampleLink.h>
-
-
 namespace epics { namespace pvDatabase { 
 using namespace epics::pvData;
 using namespace epics::pvAccess;