-
Max Kellermann authored
Conflicts: Makefile.am NEWS configure.ac src/encoder/flac_encoder.c src/log.c src/pcm_buffer.c
4f093d5b
To find the state of this project's repository at the time of any of these versions, check out
the tags.
Conflicts: Makefile.am NEWS configure.ac src/encoder/flac_encoder.c src/log.c src/pcm_buffer.c