diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-29 17:42:36 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-29 17:42:36 +0200 |
commit | 02d8dc27f991d19f63c3fd9edb02610a97f003b3 (patch) | |
tree | 3dd973cb633111eb50e5451d884199f407e3394c /Makefile.am | |
parent | d9f1bbf46e0e240dc8bdbaf6db74e499e668faa2 (diff) | |
parent | 36fe8d92f8bad4ddc1f24ede14405129ec46c0d8 (diff) | |
download | rsyslog-02d8dc27f991d19f63c3fd9edb02610a97f003b3.tar.gz rsyslog-02d8dc27f991d19f63c3fd9edb02610a97f003b3.tar.xz rsyslog-02d8dc27f991d19f63c3fd9edb02610a97f003b3.zip |
Merge branch 'udpdrop'
Conflicts:
runtime/conf.c
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions