diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-11 14:14:37 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-11 14:14:37 +0100 |
commit | ef1b6c725bb7b8e3cee6e4264a630975a496c5bd (patch) | |
tree | 3b48d8b08d237a9168ee1fe93eb621c1a0651a73 /tests/testsuites/tspgsql.conf | |
parent | 2d232617fa250d913800cddda9d0003957303edf (diff) | |
parent | 22bf4fc83274df41f9d490f522718f248e35c1f5 (diff) | |
download | rsyslog-ef1b6c725bb7b8e3cee6e4264a630975a496c5bd.tar.gz rsyslog-ef1b6c725bb7b8e3cee6e4264a630975a496c5bd.tar.xz rsyslog-ef1b6c725bb7b8e3cee6e4264a630975a496c5bd.zip |
Merge branch 'v4-beta' into v4-devel
Conflicts:
tests/Makefile.am
Diffstat (limited to 'tests/testsuites/tspgsql.conf')
0 files changed, 0 insertions, 0 deletions