From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 20 Jun 2016 09:53:46 +0000 (+0100)
Subject: Merge branch 'develop' into features/JAL-1812_JAL-2083_groovyBinding
X-Git-Tag: Release_2_10_0~164^2~1^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8c7fd90d480e2671e0fa251ada3c89fa1d18862a;p=jalview.git

Merge branch 'develop' into features/JAL-1812_JAL-2083_groovyBinding
---

8c7fd90d480e2671e0fa251ada3c89fa1d18862a
diff --cc src/jalview/bin/Jalview.java
index 2d068a4,d0b3232..76ae3ff
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@@ -173,15 -90,7 +173,16 @@@ public class Jalvie
     */
    public static void main(String[] args)
    {
 +    instance = new Jalview();
 +    instance.doMain(args);
 +  }
 +
 +  /**
 +   * @param args
 +   */
 +  void doMain(String[] args)
 +  {
+     System.setSecurityManager(null);
      System.out.println("Java version: "
              + System.getProperty("java.version"));
      System.out.println(System.getProperty("os.arch") + " "