diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-02 10:38:32 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-02 10:38:32 +0200 |
commit | c897ac6e6de3b430911cad71e7453d8b4b3c57bc (patch) | |
tree | fd6c2aab0ad78a499ee9053fdd8b17193d8967bd /plugins/omtesting/omtesting.c | |
parent | 78469b4c6a82887c70e2cac365af7a66051f8ba7 (diff) | |
parent | 4c8546fd6fb56d5439edb5a098c8f82bc8fc36aa (diff) | |
download | rsyslog-c897ac6e6de3b430911cad71e7453d8b4b3c57bc.tar.gz rsyslog-c897ac6e6de3b430911cad71e7453d8b4b3c57bc.tar.bz2 rsyslog-c897ac6e6de3b430911cad71e7453d8b4b3c57bc.zip |
Merge branch 'v4-beta' into v4-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'plugins/omtesting/omtesting.c')
0 files changed, 0 insertions, 0 deletions