##// END OF EJS Templates
Merge remote-tracking branch 'origin/5.7' into dev...
Merge remote-tracking branch 'origin/5.7' into dev Change-Id: I86dec1064d79704214e885681449ca347b193d66

File last commit:

r2712:c544258484ff
r2895:e9a2e2a5e9c0 merge
Show More
resources.qrc
8 lines | 277 B | text/plain | TextLexer
Tero Ahola
Added a new QXYSeries::replace override for performance reasons....
r1783 <RCC>
<qresource prefix="/">
<file>qml/qmloscilloscope/main.qml</file>
Tero Ahola
Improved oscilloscope demo functionality
r1785 <file>qml/qmloscilloscope/ControlPanel.qml</file>
<file>qml/qmloscilloscope/ScopeView.qml</file>
<file>qml/qmloscilloscope/MultiButton.qml</file>
Tero Ahola
Added a new QXYSeries::replace override for performance reasons....
r1783 </qresource>
</RCC>