summaryrefslogtreecommitdiffstats
path: root/runtime/var.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-05-12 09:18:04 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-05-12 09:18:04 +0200
commit21b7f7e603639fa8f354c954b0e467abb72b6c12 (patch)
treed248c1ac41b07a37f8423a01efe613d66c5ef23f /runtime/var.h
parent1e4f374d7d087fac8fbe807545ea1ed3f44c80e1 (diff)
parentd1985c4a65feb5caaea855517431ed564a13ed4c (diff)
downloadrsyslog-21b7f7e603639fa8f354c954b0e467abb72b6c12.tar.gz
rsyslog-21b7f7e603639fa8f354c954b0e467abb72b6c12.tar.xz
rsyslog-21b7f7e603639fa8f354c954b0e467abb72b6c12.zip
Merge branch 'master' into multi-dequeue
Conflicts: runtime/rsyslog.h
Diffstat (limited to 'runtime/var.h')
0 files changed, 0 insertions, 0 deletions