Merge branch 'branch-1.8' into debian
authorBdale Garbee <bdale@gag.com>
Tue, 19 Sep 2017 02:46:47 +0000 (20:46 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 19 Sep 2017 02:46:47 +0000 (20:46 -0600)
1  2 
.gitignore

diff --combined .gitignore
index 7b424a8da182e2fcb86140abe0581d3a62cdc319,48a39f733b1d2376553eaee3adfb2c2cd53d8e5f..18d642daaa8ff5de713a068df9d2334fa3289fa3
@@@ -7,6 -7,7 +7,7 @@@
  *.lnk
  *.lst
  *.map
+ *.mdwn
  *.mem
  *.o
  *.rel
@@@ -65,4 -66,3 +66,4 @@@ doc/telemetrum.htm
  doc/telemetrum.pdf
  altosui/altos-windows.log
  pdclib-root
 +ao-bringup/cal_values