Merge branch '13.09dev' into feature-configtab

core/build.xml

@@ -105,6 +105,7 @@
 					<exclude name="Test.class" />
 				</fileset>
 				<formatter type="xml"/>
+				<formatter type="plain" usefile="false" />
 			</batchtest>
 		</junit>
 		<junitreport todir="${tmp.dir}">

core/src/net/sf/openrocket/unit/Unit.java

@@ -104,7 +104,7 @@ public abstract class Unit {
 		
 		val = roundForDecimalFormat(val);
 		// Check for approximate integer
-		if (Math.abs(val - Math.floor(val)) < 0.001) {
+		if (Math.abs(val - Math.floor(val)) < 0.0001) {
 			return intFormat.format(val);
 		}
 		return decFormat.format(val);

swing/build.xml

@@ -285,6 +285,7 @@ ${nonascii}</fail>
 					<exclude name="Test.class" />
 				</fileset>
 				<formatter type="xml"/>
+				<formatter type="plain" usefile="false" />
 			</batchtest>
 		</junit>
 		<junitreport todir="${tmp.dir}">