Merge branch 'buttonbox'

Conflicts:
	doc/telemetrum-doc.xsl

Pull the buttbox version of the docs in as it had been updated.

Signed-off-by: Keith Packard <keithp@keithp.com>

1 files changed, 0 insertions, 30 deletions

diff --git a/ao-tools/altosui/AltosReader.java b/ao-tools/altosui/AltosReader.java
deleted file mode 100644
index 5be8795d..00000000
--- a/ao-tools/altosui/AltosReader.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright © 2010 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 altosui;
-
-import java.io.*;
-import java.util.*;
-import java.text.*;
-
-import altosui.AltosRecord;
-
-public class AltosReader {
-	public AltosRecord read() throws IOException, ParseException { return null; }
-	public void close() { }
-	public void write_comments(PrintStream out) { }
-}