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/exampleServer/src/exampleServer.cpp
+++ b/exampleServer/src/exampleServer.cpp
@@ -10,10 +10,7 @@
 */

 #include <pv/standardPVField.h>
-
-#define epicsExportSharedSymbols
-
-#include <exampleServer.h>
+#include <pv/exampleServer.h>

 namespace epics { namespace exampleServer { 
 using namespace epics::pvData;