Merge remote branch 'ricklon/platforms' into platforms

damellis · damellis · commit fcbbf8f4b496 · 2011-07-17T11:45:40.000-04:00
diff --git a/app/src/processing/app/debug/Target.java b/app/src/processing/app/debug/Target.java
@@ -82,7 +82,7 @@ public Target(String name, File folder) {
     } catch (Exception e) {
       System.err.println("Error loading platforms from " + 
                          platformsFile + ": " + e);                        
-     System.exit(0);	
+     //System.exit(0);	
     
     }    
    

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public Target(String name, File folder) {`
`82`	`82`	`} catch (Exception e) {`
`83`	`83`	`System.err.println("Error loading platforms from " +`
`84`	`84`	`platformsFile + ": " + e);`
`85`		`- System.exit(0);`
	`85`	`+ //System.exit(0);`
`86`	`86`
`87`	`87`	`}`
`88`	`88`