Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA

2018-09-23 00:00:14 -04:00
parent 433b30ada1 3c55966984
commit bc1e23adf3
26 changed files with 1553 additions and 1204 deletions
--- a/analysis/analysis.cpp
+++ b/analysis/analysis.cpp
@@ -15,6 +15,8 @@
 */
 #include "analysis/analysis.h"
 #include "ProfilerApp.h"
+
+#include <algorithm>
 #include <iostream>