Jmol

Revision: 17149
          http://jmol.svn.sourceforge.net/jmol/?rev=17149&view=rev
Author:   nicove
Date:     2012-05-16 20:27:11 +0000 (Wed, 16 May 2012)
Log Message:
-----------
Version

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/viewer/Jmol.properties

Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties	2012-05-16 20:14:20 UTC (rev 17148)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties	2012-05-16 20:27:11 UTC (rev 17149)
@@ -3,8 +3,12 @@
 
 date=$Date$
 
-version=12.3.25
+version=12.3.26_dev
 
+# =============================================================================
+
+#version=12.3.25
+
 # new feature: MMFF94 single point energy calculation and minimization
 #   set forcefield "MMFF"
 #   checkmm.spt

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 17148
          http://jmol.svn.sourceforge.net/jmol/?rev=17148&view=rev
Author:   nicove
Date:     2012-05-16 20:14:20 +0000 (Wed, 16 May 2012)
Log Message:
-----------
Version

Modified Paths:
--------------
    branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties

Modified: branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties	2012-05-16 14:50:32 UTC (rev 17147)
+++ branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties	2012-05-16 20:14:20 UTC (rev 17148)
@@ -4,8 +4,12 @@
 
 date=$Date$
 
-version=12.2.25
+version=12.2.26_dev
 
+# ------------------------------------------------------------------------------
+
+#version=12.2.25
+
 # bug fix: compare {22-31} {7-16} subset {*.ca} should work without ATOMSET next 
 # bug fix: compare {22-31} {7-16} should work, using {spine} as default
 # bug fix: isosurface molecular for certain flat models will fail to cap H atoms

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 17147
          http://jmol.svn.sourceforge.net/jmol/?rev=17147&view=rev
Author:   hansonr
Date:     2012-05-16 14:50:32 +0000 (Wed, 16 May 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/viewer/Viewer.java

Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Viewer.java	2012-05-16 14:15:55 UTC (rev 17146)
+++ trunk/Jmol/src/org/jmol/viewer/Viewer.java	2012-05-16 14:50:32 UTC (rev 17147)
@@ -5784,6 +5784,7 @@
     case Token.forcefield:
       // 12.3.25
       global.forceField = value;
+      minimizer = null;
       break;
     case Token.nmrurlformat:
       // 12.3.3

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 17146
          http://jmol.svn.sourceforge.net/jmol/?rev=17146&view=rev
Author:   hansonr
Date:     2012-05-16 14:15:55 +0000 (Wed, 16 May 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/minimize/forcefield/mmff/docs/MMFF94-smarts.xlsx

Modified: trunk/Jmol/src/org/jmol/minimize/forcefield/mmff/docs/MMFF94-smarts.xlsx
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.