Merge tag '1.4' into fox

tagging 1.4 release

Conflicts:
	src/Makefile

1 files changed, 44 insertions, 0 deletions

diff --git a/altosuilib/AltosUILatLon.java b/altosuilib/AltosUILatLon.java
new file mode 100644
index 00000000..688dd58b
--- /dev/null
+++ b/altosuilib/AltosUILatLon.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2014 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.altosuilib_2;
+
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+import java.io.*;
+import java.lang.Math;
+import java.awt.geom.*;
+import java.util.*;
+import java.util.concurrent.*;
+import org.altusmetrum.altoslib_4.*;
+
+public class AltosUILatLon {
+	public double	lat;
+	public double	lon;
+
+	public boolean equals(AltosUILatLon other) {
+		if (other == null)
+			return false;
+		return lat == other.lat && lon == other.lon;
+	}
+
+	public AltosUILatLon(double lat, double lon) {
+		this.lat = lat;
+		this.lon = lon;
+	}
+}