This commit was generated by cvs2svn to compensate for changes in r2,

which included commits to RCS files with non-trunk default branches.

1 files changed, 87 insertions, 0 deletions

diff --git a/diff.out b/diff.out
new file mode 100644
index 0000000..8ee81c6
--- /dev/null
+++ b/diff.out
@@ -0,0 +1,87 @@
+===================================================================
+RCS file: RCS/camera.h,v
+retrieving revision 1.1
+diff -r1.1 camera.h
+24c24
+< // $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
+---
+> // $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
+===================================================================
+RCS file: RCS/config.h,v
+retrieving revision 1.5
+diff -r1.5 config.h
+===================================================================
+RCS file: RCS/global.h,v
+retrieving revision 1.1
+diff -r1.1 global.h
+24c24
+< // $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
+---
+> // $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
+===================================================================
+RCS file: RCS/mass.h,v
+retrieving revision 1.4
+diff -r1.4 mass.h
+24c24
+< // $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
+---
+> // $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
+67a68
+> 	void getPreviousPosition(double& x, double& x, double& x) const;
+100a102
+> 	double	m_prevx,m_prevy,m_prevz;
+===================================================================
+RCS file: RCS/matrix.h,v
+retrieving revision 1.1
+diff -r1.1 matrix.h
+24c24
+< // $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
+---
+> // $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
+===================================================================
+RCS file: RCS/particles.h,v
+retrieving revision 1.3
+diff -r1.3 particles.h
+24c24
+< // $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
+---
+> // $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
+39c39,40
+< 	void add(GLfloat x, GLfloat y, GLfloat z,
+---
+> 	void add(GLfloat x1, GLfloat y1, GLfloat z1,
+> 		 GLfloat x2, GLfloat y2, GLfloat z2,
+43c44
+< 	void updateNoDraw();
+---
+> 	void update();
+49c50,51
+< 	    GLfloat	x,y,z;
+---
+> 	    GLfloat	x1,y1,z1;
+> 	    GLfloat	x2,y2,z2;
+===================================================================
+RCS file: RCS/sparks.h,v
+retrieving revision 1.3
+diff -r1.3 sparks.h
+24c24
+< // $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
+---
+> // $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
+44c44
+< 	void updateNoDraw();
+---
+> 	void update();
+rcsdiff: RCS/*.html,v: No such file or directory
+===================================================================
+RCS file: RCS/makefile,v
+retrieving revision 1.1
+diff -r1.1 makefile
+22c22
+< # $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
+---
+> # $Id: diff.out,v 1.1.1.1 2006-05-02 19:12:45 ianc Exp $
+50c50
+< DEBUG	=	-DDEBUG
+---
+> #DEBUG	=	-DDEBUG