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 /src/core/ao_storage.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 'src/core/ao_storage.c')
-rw-r--r-- | src/core/ao_storage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ao_storage.c b/src/core/ao_storage.c index adf7e4d4..6eddae7f 100644 --- a/src/core/ao_storage.c +++ b/src/core/ao_storage.c @@ -154,7 +154,7 @@ ao_storage_zapall(void) __reentrant ao_cmd_white(); if (!ao_match_word("DoIt")) return; - for (pos = 0; pos < ao_storage_config; pos += ao_storage_block) + for (pos = 0; pos < ao_storage_log_max; pos += ao_storage_block) ao_storage_erase(pos); } |