From: Bdale Garbee <bdale@gag.com>
Date: Wed, 19 Aug 2009 00:56:09 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
X-Git-Tag: 0.5~3
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=d996aa9b32fb0eb385bd3d158256c29788a42fe3;hp=7d4ceb75a454e6c9b3fe0bd934fadcb5104dea36

Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
---

diff --git a/ao-tools/ao-bitbang/Makefile.am b/ao-tools/ao-bitbang/Makefile.am
index b27c4090..f01cddd4 100644
--- a/ao-tools/ao-bitbang/Makefile.am
+++ b/ao-tools/ao-bitbang/Makefile.am
@@ -9,4 +9,4 @@ ao_bitbang_LDADD=$(AO_BITBANG_LIBS) $(LIBUSB_LIBS)
 
 ao_bitbang_SOURCES = ao-bitbang.c
 
-man_MANS=ao-bitbang.1
\ No newline at end of file
+man_MANS=ao-bitbang.1
diff --git a/ao-tools/ao-eeprom/Makefile.am b/ao-tools/ao-eeprom/Makefile.am
index ffd437e8..efeed976 100644
--- a/ao-tools/ao-eeprom/Makefile.am
+++ b/ao-tools/ao-eeprom/Makefile.am
@@ -9,4 +9,4 @@ ao_eeprom_LDADD=$(AO_EEPROM_LIBS) $(LIBUSB_LIBS)
 
 ao_eeprom_SOURCES = ao-eeprom.c
 
-man_MANS = ao-eeprom.1
\ No newline at end of file
+man_MANS = ao-eeprom.1
diff --git a/ao-tools/ao-load/Makefile.am b/ao-tools/ao-load/Makefile.am
index e8fed8b0..3c48dc27 100644
--- a/ao-tools/ao-load/Makefile.am
+++ b/ao-tools/ao-load/Makefile.am
@@ -9,4 +9,4 @@ ao_load_LDADD=$(AO_LOAD_LIBS) $(LIBUSB_LIBS)
 
 ao_load_SOURCES = ao-load.c
 
-man_MANS = ao-load.1
\ No newline at end of file
+man_MANS = ao-load.1
diff --git a/ao-tools/ao-load/ao-load.c b/ao-tools/ao-load/ao-load.c
index c27fcbe9..642af2fe 100644
--- a/ao-tools/ao-load/ao-load.c
+++ b/ao-tools/ao-load/ao-load.c
@@ -89,6 +89,9 @@ rewrite(struct hex_image *image, unsigned addr, char *data, int len)
 	memcpy(image->data + addr - image->address, data, len);
 }
 
+<<<<<<< HEAD:ao-tools/ao-load/ao-load.c
+static const struct option
+=======
 static const struct option options[] = {
 	{ .name = "tty", .has_arg = 1, .val = 'T' },
 	{ 0, 0, 0, 0},
@@ -100,6 +103,7 @@ static void usage(char *program)
 	exit(1);
 }
 
+>>>>>>> c29275b72438637d46d7a50742882d2736eb176a:ao-tools/ao-load/ao-load.c
 int
 main (int argc, char **argv)
 {
diff --git a/ao-tools/ao-rawload/Makefile.am b/ao-tools/ao-rawload/Makefile.am
index c157d3d9..d2c55658 100644
--- a/ao-tools/ao-rawload/Makefile.am
+++ b/ao-tools/ao-rawload/Makefile.am
@@ -9,4 +9,4 @@ ao_rawload_LDADD=$(AO_RAWLOAD_LIBS) $(LIBUSB_LIBS)
 
 ao_rawload_SOURCES = ao-rawload.c
 
-man_MANS=ao-rawload.1
\ No newline at end of file
+man_MANS=ao-rawload.1