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

Conflicts:
	ao-tools/ao-bitbang/Makefile.am
	ao-tools/ao-eeprom/Makefile.am
	ao-tools/ao-load/Makefile.am
	ao-tools/ao-load/ao-load.c
	ao-tools/ao-rawload/Makefile.am

diff --cc ao-tools/ao-bitbang/Makefile.am
index f094c7bd9bf4942ec39d775f8501842e42241b46,b27c409089414a2a4c7a2acb7250852a107bdbe3..f01cddd47d5e940f34d6efcbda9194cff7452838
--- 1/ao-tools/ao-bitbang/Makefile.am
--- 2/ao-tools/ao-bitbang/Makefile.am
+++ b/ao-tools/ao-bitbang/Makefile.am
@@@ -8,3 -8,5 +8,5 @@@ ao_bitbang_DEPENDENCIES = $(AO_BITBANG_
  ao_bitbang_LDADD=$(AO_BITBANG_LIBS) $(LIBUSB_LIBS)
  
  ao_bitbang_SOURCES = ao-bitbang.c
 -man_MANS=ao-bitbang.1
+ 
++man_MANS=ao-bitbang.1

diff --cc ao-tools/ao-eeprom/Makefile.am
index 587acee7898e025139773cc12e831e2f05074ce4,ffd437e83bf229ca49872d6fe2ed72b39507923c..efeed97689d40c832d7b4c4a249c4f973a023b7d
--- 1/ao-tools/ao-eeprom/Makefile.am
--- 2/ao-tools/ao-eeprom/Makefile.am
+++ b/ao-tools/ao-eeprom/Makefile.am
@@@ -8,3 -8,5 +8,5 @@@ ao_eeprom_DEPENDENCIES = $(AO_EEPROM_LI
  ao_eeprom_LDADD=$(AO_EEPROM_LIBS) $(LIBUSB_LIBS)
  
  ao_eeprom_SOURCES = ao-eeprom.c
 -man_MANS = ao-eeprom.1
+ 
++man_MANS = ao-eeprom.1

diff --cc ao-tools/ao-load/Makefile.am
index 8a8392afb6d4fd76c09bd84b2e848705c3916d2d,e8fed8b090251800806024d7dafaef2e8023094a..3c48dc27eb4a70ed1801d1c3ac125043a2f80499
--- 1/ao-tools/ao-load/Makefile.am
--- 2/ao-tools/ao-load/Makefile.am
+++ b/ao-tools/ao-load/Makefile.am
@@@ -8,3 -8,5 +8,5 @@@ ao_load_DEPENDENCIES = $(AO_LOAD_LIBS
  ao_load_LDADD=$(AO_LOAD_LIBS) $(LIBUSB_LIBS)
  
  ao_load_SOURCES = ao-load.c
 -man_MANS = ao-load.1
+ 
++man_MANS = ao-load.1

diff --cc ao-tools/ao-load/ao-load.c
index 6966dd3a98bf2909f6bd294e0b26ab6163316016,c27fcbe9c4d191bcb3005f9e7d2964e2eaba3c00..642af2fed7ada02beccf08c2fe4e1fe35c9b1e3a
--- 1/ao-tools/ao-load/ao-load.c
--- 2/ao-tools/ao-load/ao-load.c
+++ b/ao-tools/ao-load/ao-load.c
@@@ -96,7 -89,17 +89,21 @@@ rewrite(struct hex_image *image, unsign
        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},
+ };
+ 
+ static void usage(char *program)
+ {
+       fprintf(stderr, "usage: %s [--tty <tty-name>] file.ihx serial-number\n", program);
+       exit(1);
+ }
+ 
++>>>>>>> c29275b72438637d46d7a50742882d2736eb176a:ao-tools/ao-load/ao-load.c
  int
  main (int argc, char **argv)
  {

diff --cc ao-tools/ao-rawload/Makefile.am
index 24013a85694727580fd60bd374d5708ad29bfb2c,c157d3d96969ea8ba7433f33b711fc7c4b9b4e71..d2c55658804419875bf31d8fa1e668185c5e5055
--- 1/ao-tools/ao-rawload/Makefile.am
--- 2/ao-tools/ao-rawload/Makefile.am
+++ b/ao-tools/ao-rawload/Makefile.am
@@@ -8,3 -8,5 +8,5 @@@ ao_rawload_DEPENDENCIES = $(AO_RAWLOAD_
  ao_rawload_LDADD=$(AO_RAWLOAD_LIBS) $(LIBUSB_LIBS)
  
  ao_rawload_SOURCES = ao-rawload.c
 -man_MANS=ao-rawload.1
+ 
++man_MANS=ao-rawload.1