diff options
| author | Bdale Garbee <bdale@gag.com> | 2013-12-19 01:38:40 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2013-12-19 01:38:40 -0700 |
| commit | 575bbaf976c5840fd0e308549c45a466fdec1352 (patch) | |
| tree | 11bfb498348bf7687bffc24699c4b1a998988ee4 /ao-tools/ao-dbg/ao-dbg-parse.c | |
| parent | b825116df173b77e2cab217a7b76112c742f9279 (diff) | |
| parent | bc3610d8cecbfed40c62d4dcb93fc9a4d2a7c9e3 (diff) | |
Merge branch 'branch-1.3' into debian
Conflicts:
ChangeLog
altoslib/AltosRecordMM.java
altosui/Makefile.am
altosui/altos-windows.nsi.in
configure.ac
debian/changelog
debian/control
doc/Makefile
doc/altusmetrum.xsl
doc/release-notes-1.2.1.xsl
doc/release-notes-1.2.xsl
Diffstat (limited to 'ao-tools/ao-dbg/ao-dbg-parse.c')
| -rw-r--r-- | ao-tools/ao-dbg/ao-dbg-parse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ao-tools/ao-dbg/ao-dbg-parse.c b/ao-tools/ao-dbg/ao-dbg-parse.c index dcb9099d..ba691834 100644 --- a/ao-tools/ao-dbg/ao-dbg-parse.c +++ b/ao-tools/ao-dbg/ao-dbg-parse.c @@ -198,7 +198,7 @@ command_read (void) if (!s51_tty) { if (!s51_device) s51_device = getenv("AO_DBG_DEVICE"); - s51_tty = cc_usbdevs_find_by_arg(s51_device, "TIDongle"); + s51_tty = cc_usbdevs_find_by_arg(s51_device, "TeleDongle"); } s51_dbg = ccdbg_open (s51_tty); if (!s51_dbg) |