[Kst] branches/work/kst/newdocs/doc/kst

[Duncan Hanson]

I don't think that it will be too bad to manually merge everything.

I did this so that I could keep track of which screenshots aren't being used 
anymore.

Duncan.

On Thursday 05 October 2006 14:18, you wrote:
> This is going to make it very hard to merge the branch.  svn merge won't
> work properly like this now.  We had the same problem with Barth's branch
> where he removed a file and re-added it back.  I'm not entirely sure what
> to do now besides either having you start over or be aware that we're going
> to have to manually merge everything.
>
> On Thursday 05 October 2006 17:13, Duncan Hanson wrote:
> > SVN commit 592813 by dhanson:
> >
> > temporarily remove figures- these will come back as i go through the
> > docs.
> >
> >  D             Diagram-kst-array.png
> >  D             Diagram-kst-datatypes.png
> >  D             Diagram-kst-frames.png
> >  D             Diagram-kst-matrix.png
> >  D             Diagram-kst-windowplotrelation.png
> >  D             Equation-kst-correctedpitch.png
> >  D             Formula-kst-autocorrelation.png
> >  D             Formula-kst-autocorrelation2.png
> >  D             Formula-kst-bandpass.png
> >  D             Formula-kst-bandstop.png
> >  D             Formula-kst-convolution.png
> >  D             Formula-kst-crosscorrelation.png
> >  D             Formula-kst-deconvolution.png
> >  D             Formula-kst-exponentialfitequation.png
> >  D             Formula-kst-gaussianfitequation.png
> >  D             Formula-kst-gaussianprobability.png
> >  D             Formula-kst-generallinearmodel.png
> >  D             Formula-kst-generallinearmodelexample.png
> >  D             Formula-kst-gradientequation.png
> >  D             Formula-kst-gradientsumofsquares.png
> >  D             Formula-kst-highpass.png
> >  D             Formula-kst-linefitequation.png
> >  D             Formula-kst-linefitsumofsquaredresiduals.png
> >  D             Formula-kst-lorentzianfitequation.png
> >  D             Formula-kst-lowpass.png
> >  D             Formula-kst-polynomialfitequation.png
> >  D             Formula-kst-sinusoidfitequation.png
> >  D             Icon-kst-datamanager.png
> >  D             Icon-kst-datawizard.png
> >  D             Icon-kst-layoutmode.png
> >  D             Icon-kst-tiedzoom.png
> >  D             Icon-kst-xmousezoom.png
> >  D             Icon-kst-xymousezoom.png
> >  D             Screenshot-kst-arraywindow.png
> >  D             Screenshot-kst-configureshortcutswindow.png
> >  D             Screenshot-kst-curveoptions.png
> >  D             Screenshot-kst-curvewindow.png
> >  D             Screenshot-kst-datamanager.png
> >  D             Screenshot-kst-datamode.png
> >  D             Screenshot-kst-datawizard1.png
> >  D             Screenshot-kst-datawizard2.png
> >  D             Screenshot-kst-datawizard3.png
> >  D             Screenshot-kst-debuglog.png
> >  D             Screenshot-kst-defineshortcutwindow.png
> >  D             Screenshot-kst-demo.png
> >  D             Screenshot-kst-democorrected.png
> >  D             Screenshot-kst-editequation.png
> >  D             Screenshot-kst-equationwindow.png
> >  D             Screenshot-kst-eventmonitor-loggingsettings.png
> >  D             Screenshot-kst-eventmonitor-serversettings.png
> >  D             Screenshot-kst-eventmonitor.png
> >  D             Screenshot-kst-exportgraphics.png
> >  D             Screenshot-kst-filesave.png
> >  D             Screenshot-kst-fittedline.png
> >  D             Screenshot-kst-histogramwindow.png
> >  D             Screenshot-kst-imagewindow.png
> >  D             Screenshot-kst-labeleditor.png
> >  D             Screenshot-kst-mainwindow.png
> >  D             Screenshot-kst-matrixwindow.png
> >  D             Screenshot-kst-maxima-datapoints.png
> >  D             Screenshot-kst-mditabpage.png
> >  D             Screenshot-kst-mditoplevel.png
> >  D             Screenshot-kst-multipleselectedplots.png
> >  D             Screenshot-kst-open-file-button.png
> >  D             Screenshot-kst-plotdialogcontent.png
> >  D             Screenshot-kst-plotdialoglabels.png
> >  D             Screenshot-kst-plotdialoglegend.png
> >  D             Screenshot-kst-plotdialoglimits.png
> >  D             Screenshot-kst-plotdialogmarkers.png
> >  D             Screenshot-kst-plotdialogtop.png
> >  D             Screenshot-kst-pluginswindow.png
> >  D             Screenshot-kst-powerspectrawindow.png
> >  D             Screenshot-kst-quickstart.png
> >  D             Screenshot-kst-simpledata.png
> >  D             Screenshot-kst-tiedzoom.png
> >  D             Screenshot-kst-tutorial-datawizard-done.png
> >  D             Screenshot-kst-tutorial-gyro-multiple.png
> >  D             Screenshot-kst-tutorial-gyro1.png
> >  D             Screenshot-kst-vectorwindow.png
> >  D             Screenshot-kst-zoom.png
> >  D             Symbol-kst-Gamma.png
> >  D             Symbol-kst-lambda.png
> >  D             Symbol-kst-mu.png
> >  D             Symbol-kst-sigma.png
> >  D             Symbol-kst-theta.png
> >  D             Widget-kst-close.png
> >  D             Widget-kst-colourchooser.png
> >  D             Widget-kst-defaultcolours.png
> >  D             Widget-kst-maximize.png
> >  D             Widget-kst-minimize.png
> >  D             Widget-kst-swapcolour.png
> >  D             Widget-kst-undock.png