# HG changeset patch
# User Chris Cannam
# Date 1461150388 -3600
# Node ID aa61e73cf5804c90b3be3a6b68665bc87c42e1c1
# Parent  a1f410f895d3edf8008067a57d86f92b5da278de# Parent  c475940aba799e3c2c380d1b06a8eedef13e3713
Merge branches 3.0-integration and imaf_enc to 3.0-plus-imaf

diff -r a1f410f895d3 -r aa61e73cf580 data/fileio/FileFinder.h
--- a/data/fileio/FileFinder.h	Fri Apr 15 16:26:15 2016 +0100
+++ b/data/fileio/FileFinder.h	Wed Apr 20 12:06:28 2016 +0100
@@ -32,6 +32,7 @@
         CSVFile,
         LayerFileNonSV,
         LayerFileNoMidiNonSV,
+        IMAFile,
     };
 
     virtual QString getOpenFileName(FileType type, QString fallbackLocation = "") = 0;