Mercurial > hg > svgui
comparison layer/LayerFactory.h @ 771:a964151832a7
Merge from branch tony_integration
author | Chris Cannam |
---|---|
date | Wed, 14 May 2014 09:54:34 +0100 |
parents | 765bb3774c4f |
children | b12cd1c2dad5 |
comparison
equal
deleted
inserted
replaced
768:8b614632568c | 771:a964151832a7 |
---|---|
33 Spectrogram, | 33 Spectrogram, |
34 TimeRuler, | 34 TimeRuler, |
35 TimeInstants, | 35 TimeInstants, |
36 TimeValues, | 36 TimeValues, |
37 Notes, | 37 Notes, |
38 FlexiNotes, | |
38 Regions, | 39 Regions, |
39 Text, | 40 Text, |
40 Image, | 41 Image, |
41 Colour3DPlot, | 42 Colour3DPlot, |
42 Spectrum, | 43 Spectrum, |