diff options
| author | Keith Packard <keithp@keithp.com> | 2014-07-15 22:55:20 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-07-15 22:55:20 -0700 |
| commit | 3cf030fffffd223c3717011e03aac82346295d71 (patch) | |
| tree | b6da4fbb1180b75bedb86ce608503a6c0aeb47f3 /ao-tools/lib/ao-hex.h | |
| parent | 607fbb01710be1cb263625337f5be3d0fb48d5e7 (diff) | |
| parent | 9ab3a1de95b705783c31a7e16447f52c10b6b480 (diff) | |
Merge tag '1.4' into fox
tagging 1.4 release
Conflicts:
src/Makefile
Diffstat (limited to 'ao-tools/lib/ao-hex.h')
| -rw-r--r-- | ao-tools/lib/ao-hex.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ao-tools/lib/ao-hex.h b/ao-tools/lib/ao-hex.h index 98497460..eb510ba2 100644 --- a/ao-tools/lib/ao-hex.h +++ b/ao-tools/lib/ao-hex.h @@ -51,7 +51,6 @@ struct ao_hex_image { struct ao_sym { unsigned addr; - unsigned default_addr; char *name; bool required; bool found; |