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 b27c409089414a2a4c7a2acb7250852a107bdbe3..f01cddd47d5e940f34d6efcbda9194cff7452838 100644 (file)
--- 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 ffd437e83bf229ca49872d6fe2ed72b39507923c..efeed97689d40c832d7b4c4a249c4f973a023b7d 100644 (file)
--- 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 e8fed8b090251800806024d7dafaef2e8023094a..3c48dc27eb4a70ed1801d1c3ac125043a2f80499 100644 (file)
--- 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 c27fcbe9c4d191bcb3005f9e7d2964e2eaba3c00..642af2fed7ada02beccf08c2fe4e1fe35c9b1e3a 100644 (file)
--- 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 c157d3d96969ea8ba7433f33b711fc7c4b9b4e71..d2c55658804419875bf31d8fa1e668185c5e5055 100644 (file)
--- 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