summaryrefslogtreecommitdiffstats
path: root/msg.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-04-16 16:58:15 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-04-16 16:58:15 +0200
commitc5178a4d21cf8ca3362b8a8394d0e762801550a4 (patch)
tree0916303e0cd18e00397a6eb28a64b32aa5908c4d /msg.h
parent65cdfc1777e1c189f28dfe11fa1ab0d08930b458 (diff)
parent11a526bcee95dab6a5bf2cc25a07dc6d65eaa177 (diff)
downloadrsyslog-c5178a4d21cf8ca3362b8a8394d0e762801550a4.tar.gz
rsyslog-c5178a4d21cf8ca3362b8a8394d0e762801550a4.tar.xz
rsyslog-c5178a4d21cf8ca3362b8a8394d0e762801550a4.zip
Merge branch 'master' into beta
3.17.x is the new beta Conflicts: ChangeLog configure.ac
Diffstat (limited to 'msg.h')
0 files changed, 0 insertions, 0 deletions