Merge tag '1.4' into fox

tagging 1.4 release

Conflicts:
	src/Makefile

1 files changed, 0 insertions, 43 deletions

diff --git a/src/core/ao_eeprom.h b/src/core/ao_eeprom.h
deleted file mode 100644
index 915522bf..00000000
--- a/src/core/ao_eeprom.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright © 2013 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.
- */
-
-#ifndef _AO_EEPROM_H_
-#define _AO_EEPROM_H_
-
-extern const ao_pos_t	ao_eeprom_total;
-
-/*
- * Write to eeprom
- */
-
-uint8_t
-ao_eeprom_write(ao_pos_t pos32, __xdata void *v, uint16_t len);
-
-/*
- * Read from eeprom
- */
-uint8_t
-ao_eeprom_read(ao_pos_t pos, __xdata void *v, uint16_t len);
-
-/*
- * Initialize eeprom
- */
-
-void
-ao_eeprom_init(void);
-
-#endif /* _AO_EEPROM_H_ */