diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-14 18:32:40 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-14 18:32:40 +0100 |
| commit | 0871d0a077c8adfdda8f055e021239dc4f354f7e (patch) | |
| tree | eb7d0a3ac4e5821b0ec8953717e49b838e062378 /runtime | |
| parent | a357646ca124dbbf866606e8a48997154c40e205 (diff) | |
| parent | e335a65788ccb9cd381dbd28982079a914f4ae4e (diff) | |
| download | rsyslog-0871d0a077c8adfdda8f055e021239dc4f354f7e.tar.gz rsyslog-0871d0a077c8adfdda8f055e021239dc4f354f7e.tar.xz rsyslog-0871d0a077c8adfdda8f055e021239dc4f354f7e.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
plugins/imfile/imfile.c
plugins/omtesting/omtesting.c
tcpsrv.c
threads.c
Diffstat (limited to 'runtime')
0 files changed, 0 insertions, 0 deletions