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/exampleDatabase/src/exampleDatabase.cpp
+++ b/exampleDatabase/src/exampleDatabase.cpp
@@ -26,8 +26,8 @@
 #include <pv/recordList.h>
 #include <pv/traceRecord.h>

-#include <powerSupply.h>
-#include <exampleDatabase.h>
+#include <pv/powerSupply.h>
+#include <pv/exampleDatabase.h>

 using namespace std;
 using std::tr1::static_pointer_cast;