diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-19 18:16:40 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-19 18:16:40 +0200 |
| commit | 9b06a4c26422b0a8727e1b3c6cc7141226186105 (patch) | |
| tree | 4fdc45a5374e3c701785ea90cffebeae6d4b5a58 /runtime | |
| parent | 7f0cd8c8b93ca395949e5d28c3a8f422e6695c8d (diff) | |
| parent | fb5cd633e6f4852841354fcf55c971063cc6a871 (diff) | |
| download | rsyslog-9b06a4c26422b0a8727e1b3c6cc7141226186105.tar.gz rsyslog-9b06a4c26422b0a8727e1b3c6cc7141226186105.tar.xz rsyslog-9b06a4c26422b0a8727e1b3c6cc7141226186105.zip | |
Merge branch 'v5-beta'
Conflicts:
plugins/imptcp/imptcp.c
Diffstat (limited to 'runtime')
0 files changed, 0 insertions, 0 deletions