summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-02-10 17:41:28 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-02-10 17:41:28 +0100
commit200e2b66308fb0ca861b5ba72d2b408b7f24aac3 (patch)
tree096885420457b9425fa8ccbbcdb1b005196a16a6 /doc/src
parent7a0c7c61a57730ead60b7d4982247b76febb3bd9 (diff)
parentc8ebe623376bc025bf166ec333ac874c215de816 (diff)
downloadrsyslog-200e2b66308fb0ca861b5ba72d2b408b7f24aac3.tar.gz
rsyslog-200e2b66308fb0ca861b5ba72d2b408b7f24aac3.tar.xz
rsyslog-200e2b66308fb0ca861b5ba72d2b408b7f24aac3.zip
Merge branch 'beta' into master
Conflicts: ChangeLog tests/parsertest.sh
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/rsyslog_pgsql.odtbin0 -> 41755 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/rsyslog_pgsql.odt b/doc/src/rsyslog_pgsql.odt
new file mode 100644
index 00000000..5034c5fb
--- /dev/null
+++ b/doc/src/rsyslog_pgsql.odt
Binary files differ