diff options
| author | Andre Lorbach <alorbach@adiscon.com> | 2011-08-05 14:30:30 +0200 |
|---|---|---|
| committer | Andre Lorbach <alorbach@adiscon.com> | 2011-08-05 14:30:30 +0200 |
| commit | 0bf454aba2b62618ab6c2a7c4b17641c0bce297b (patch) | |
| tree | dfad92a5d03cdac5d4609ce94257c95dad9bc059 /runtime/rsyslog.h | |
| parent | b04a5b89e4c730f861a4e21479d9f2c69b28828f (diff) | |
| parent | ece1cb640926848d0d155f29b01a6406af441cb0 (diff) | |
| download | rsyslog-0bf454aba2b62618ab6c2a7c4b17641c0bce297b.tar.gz rsyslog-0bf454aba2b62618ab6c2a7c4b17641c0bce297b.tar.xz rsyslog-0bf454aba2b62618ab6c2a7c4b17641c0bce297b.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
Diffstat (limited to 'runtime/rsyslog.h')
0 files changed, 0 insertions, 0 deletions