diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-12-18 12:01:52 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-12-18 12:01:52 +0100 |
| commit | 66dcd68d625f9afe22fced995696ef654e8abe37 (patch) | |
| tree | 832d2fb75d6b69bdcaaf51cafcbb553c194359a0 /plugins/imfile/imfile.c | |
| parent | 32847e06187670c8e074f8906aa62b2380a50140 (diff) | |
| parent | fbffd924e67cdd531dfdc2ccdddba59bd0b33752 (diff) | |
| download | rsyslog-66dcd68d625f9afe22fced995696ef654e8abe37.tar.gz rsyslog-66dcd68d625f9afe22fced995696ef654e8abe37.tar.bz2 rsyslog-66dcd68d625f9afe22fced995696ef654e8abe37.zip | |
Merge branch 'v7-stable-libnet-frag'
Conflicts:
configure.ac
plugins/impstats/impstats.c
plugins/omudpspoof/omudpspoof.c
runtime/rsyslog.h
Diffstat (limited to 'plugins/imfile/imfile.c')
0 files changed, 0 insertions, 0 deletions