comparison svgui.pro @ 1052:834e94eb1bca 3.0-integration

Merge from branch "alignment-simple"
author Chris Cannam
date Thu, 21 Apr 2016 15:06:05 +0100
parents 3691af49291c f535f6e5dbb0
children 0c4734cd33c1
comparison
equal deleted inserted replaced
1050:3691af49291c 1052:834e94eb1bca
92 layer/TimeInstantLayer.cpp \ 92 layer/TimeInstantLayer.cpp \
93 layer/TimeRulerLayer.cpp \ 93 layer/TimeRulerLayer.cpp \
94 layer/TimeValueLayer.cpp \ 94 layer/TimeValueLayer.cpp \
95 layer/WaveformLayer.cpp 95 layer/WaveformLayer.cpp
96 96
97 HEADERS += view/Overview.h \ 97 HEADERS += view/AlignmentView.h \
98 view/Overview.h \
98 view/Pane.h \ 99 view/Pane.h \
99 view/PaneStack.h \ 100 view/PaneStack.h \
100 view/View.h \ 101 view/View.h \
101 view/ViewManager.h \ 102 view/ViewManager.h \
102 view/ViewProxy.h 103 view/ViewProxy.h
103 SOURCES += view/Overview.cpp \ 104
105 SOURCES += view/AlignmentView.cpp \
106 view/Overview.cpp \
104 view/Pane.cpp \ 107 view/Pane.cpp \
105 view/PaneStack.cpp \ 108 view/PaneStack.cpp \
106 view/View.cpp \ 109 view/View.cpp \
107 view/ViewManager.cpp 110 view/ViewManager.cpp
108 111