summaryrefslogtreecommitdiffstats
path: root/doc/Makefile.am
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-07-09 17:45:21 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-07-09 17:45:21 +0200
commit809f0a16e75bf7679a4919c642699a7bb3039ae3 (patch)
tree5669c84e04fe8e6a605d11b9d50634ff8ce9c266 /doc/Makefile.am
parentcafb951020817cca6b89b5cc6b91f3a8ab86f29a (diff)
parent4130ca8670b37d0fe92a1abb47a2840c62604ded (diff)
downloadrsyslog-809f0a16e75bf7679a4919c642699a7bb3039ae3.tar.gz
rsyslog-809f0a16e75bf7679a4919c642699a7bb3039ae3.tar.xz
rsyslog-809f0a16e75bf7679a4919c642699a7bb3039ae3.zip
Merge branch 'master' into udpspoof & cleanup & slight optimization
Conflicts: runtime/msg.c I messed up and did some changes during the merge commit ;) But these are not large, just a little bit of cleanup and some very slight optimizations inside the msg object.
Diffstat (limited to 'doc/Makefile.am')
0 files changed, 0 insertions, 0 deletions