Merge tag '1.4' into fox

tagging 1.4 release

Conflicts:
	src/Makefile

1 files changed, 5 insertions, 7 deletions

diff --git a/altosuilib/AltosUIGraph.java b/altosuilib/AltosUIGraph.java
index 061a7629..9cca088d 100644
--- a/altosuilib/AltosUIGraph.java
+++ b/altosuilib/AltosUIGraph.java
@@ -15,14 +15,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_2;
 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_4.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
@@ -82,11 +82,9 @@ public class AltosUIGraph implements AltosUnitsListener {
 	public void addSeries(String label, int fetch, AltosUnits units, Color color) {
 		addSeries(label, fetch, units, color, true, newAxis(label, units, color));
 	}
-	
+
 	public void addMarker(String label, int fetch, Color color) {
 		AltosUIMarker		marker = new AltosUIMarker(fetch, color, plot);
-		if (enable != null)
-			enable.add(label, marker, true);
 		this.graphers.add(marker);
 	}
 
@@ -131,7 +129,7 @@ public class AltosUIGraph implements AltosUnitsListener {
 		this.axis_index = 0;
 
 		xAxis = new NumberAxis("Time (s)");
-		
+
 		xAxis.setAutoRangeIncludesZero(true);
 
 		plot = new XYPlot();
@@ -158,4 +156,4 @@ public class AltosUIGraph implements AltosUnitsListener {
 
 		AltosPreferences.register_units_listener(this);
 	}
-}
\ No newline at end of file
+}