# HG changeset patch
# User Chris Cannam
# Date 1424943848 0
# Node ID d0b89689f2b44857ccf588815d7be921ec68bee4
# Parent  62198dde171e9474ccdfb1e5b22d5d1e063fdf72# Parent  fbd2534d17f80755e87988447492faa7861f4378
Update and merge

diff -r fbd2534d17f8 -r d0b89689f2b4 .hgsubstate
--- a/.hgsubstate	Wed Feb 18 12:08:17 2015 +0000
+++ b/.hgsubstate	Thu Feb 26 09:44:08 2015 +0000
@@ -1,5 +1,5 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 879bdc878826bebec67130326f99397c430419b1 sv-dependency-builds
 7b2dd0d4c366057ce25547a4015f3a76981abedc svapp
-344c9ea901812553a087da7fecbf5d3596257fa4 svcore
+780959a4fe23619a2efdfaaa2414e9f3ec18045f svcore
 78e041e45ff0ff3c103e0d794c6f66f391020aff svgui
diff -r fbd2534d17f8 -r d0b89689f2b4 main/main.cpp
--- a/main/main.cpp	Wed Feb 18 12:08:17 2015 +0000
+++ b/main/main.cpp	Thu Feb 26 09:44:08 2015 +0000
@@ -20,6 +20,7 @@
 #include "base/TempDirectory.h"
 #include "base/PropertyContainer.h"
 #include "base/Preferences.h"
+#include "data/fileio/FileSource.h"
 #include "widgets/TipDialog.h"
 #include "widgets/InteractiveFileFinder.h"
 #include "svapp/framework/TransformUserConfigurator.h"
@@ -457,6 +458,8 @@
     settings.endGroup();
 #endif
 
+    FileSource::debugReport();
+    
     delete gui;
 
     cleanupMutex.unlock();
diff -r fbd2534d17f8 -r d0b89689f2b4 version.h
--- a/version.h	Wed Feb 18 12:08:17 2015 +0000
+++ b/version.h	Thu Feb 26 09:44:08 2015 +0000
@@ -1,1 +1,1 @@
-#define SV_VERSION "2.4.1"
+#define SV_VERSION "2.4"