# HG changeset patch
# User Chris Cannam
# Date 1385116896 0
# Node ID bc78f88a66f5926f1ec934bfd214e9fa0ff3421f
# Parent  a3fcaad1a269c32241b4a2483d18d5bf423db2e0# Parent  3fc0df28953377c96e501f41db6fb80d29d6aa4a
Merge from default branch

diff -r a3fcaad1a269 -r bc78f88a66f5 framework/MainWindowBase.cpp
--- a/framework/MainWindowBase.cpp	Fri Jul 12 13:26:41 2013 +0100
+++ b/framework/MainWindowBase.cpp	Fri Nov 22 10:41:36 2013 +0000
@@ -313,6 +313,8 @@
         return ff->getOpenFileName(type, m_sessionFile);
     case FileFinder::ImageFile:
         return ff->getOpenFileName(type, m_sessionFile);
+    case FileFinder::CSVFile:
+        return ff->getOpenFileName(type, m_sessionFile);
     case FileFinder::AnyFile:
         if (getMainModel() != 0 &&
             m_paneStack != 0 &&
@@ -343,6 +345,8 @@
         return ff->getSaveFileName(type, m_sessionFile);
     case FileFinder::ImageFile:
         return ff->getSaveFileName(type, m_sessionFile);
+    case FileFinder::CSVFile:
+        return ff->getSaveFileName(type, m_sessionFile);
     case FileFinder::AnyFile:
         return ff->getSaveFileName(type, m_sessionFile);
     }