Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v0.15.x' | Max Kellermann | 2009-12-15 | 1 | -0/+3 |
| | | | | | | | | Conflicts: src/archive/bz2_plugin.c src/archive_api.h src/input/file_input_plugin.c test/run_input.c | ||||
* | archive_api.h: moved struct archive_plugin to archive_plugin.h | Max Kellermann | 2009-12-15 | 1 | -0/+86 |