diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-12 13:24:41 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-12 13:24:41 +0100 |
| commit | edd68334ac16aced4505bbde263313445766e899 (patch) | |
| tree | 0589469aafd74cf293b6aacdfd9ebe1fa6340c31 /plugins/ompgsql/ompgsql.c | |
| parent | 81bf276d9274564fcd08790aa57836dd3ca4c1c6 (diff) | |
| parent | 0a5b731f2f18168795bcdefd9b6fa562dce6a0d5 (diff) | |
| download | rsyslog-edd68334ac16aced4505bbde263313445766e899.tar.gz rsyslog-edd68334ac16aced4505bbde263313445766e899.tar.bz2 rsyslog-edd68334ac16aced4505bbde263313445766e899.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
tests/Makefile.am
Diffstat (limited to 'plugins/ompgsql/ompgsql.c')
0 files changed, 0 insertions, 0 deletions