Mercurial > hg > svcore

diff data/fileio/CSVFormat.h @ 908:166e3fc1e962 tony_integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Wed, 07 May 2014 15:18:45 +0100
parents 69cc0454ed72
children 59e7fe1b1003
line wrap: on
line diff
--- a/data/fileio/CSVFormat.h	Wed May 07 15:14:17 2014 +0100
+++ b/data/fileio/CSVFormat.h	Wed May 07 15:18:45 2014 +0100
@@ -26,6 +26,7 @@
 	OneDimensionalModel,
 	TwoDimensionalModel,
         TwoDimensionalModelWithDuration,
+        TwoDimensionalModelWithDurationAndPitch,
 	ThreeDimensionalModel
     };
     
@@ -46,6 +47,7 @@
         ColumnEndTime,
         ColumnDuration,
         ColumnValue,
+        ColumnPitch,
         ColumnLabel
     };