• Max Kellermann's avatar
    Merge branch 'v0.15.x' · 530e4807
    Max Kellermann authored
    Conflicts:
    	src/archive/bz2_plugin.c
    	src/archive_api.h
    	src/input/file_input_plugin.c
    	test/run_input.c
    530e4807
run_input.c 2.97 KB