Resolved conflicts in 'ChangeLog'

This commit is contained in:
Fred Gleason
2020-06-11 14:18:24 -04:00
40 changed files with 442 additions and 91 deletions

1
.gitignore vendored
View File

@@ -107,6 +107,7 @@ tests/audio_export_test
tests/audio_import_test
tests/audio_metadata_test
tests/audio_peaks_test
tests/cmdline_parser_test
tests/datedecode_test
tests/dateparse_test
tests/db_charset_test