[Jmol-commits] CVS: Jmol/src/org/openscience/jmol/applet AppletCanvas.java,1.12,1.13 NonJavaSort.java,1.4,1.5

[Michael T H. <mic...@us...>]

Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/applet
In directory sc8-pr-cvs1:/tmp/cvs-serv20521/src/org/openscience/jmol/applet

Modified Files:
	AppletCanvas.java NonJavaSort.java 
Log Message:
merged with b6 branch


Index: AppletCanvas.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/applet/AppletCanvas.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13

Index: NonJavaSort.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/applet/NonJavaSort.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5