summaryrefslogtreecommitdiffstats
path: root/runtime/vmop.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-07-18 14:51:49 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-07-18 14:51:49 +0200
commitd45a286f2dee3c3d5aefef1ac16a02578c95f574 (patch)
tree9a6dc8ff9fbf7feea6db3eb4a17f0c21c2efb9fb /runtime/vmop.h
parentc01ed77e5085baec0ad0a8c6ffcb32f11b6939e8 (diff)
parent73abfd1fad59ffc426072bac779e4c0f4c712619 (diff)
downloadrsyslog-d45a286f2dee3c3d5aefef1ac16a02578c95f574.tar.gz
rsyslog-d45a286f2dee3c3d5aefef1ac16a02578c95f574.tar.xz
rsyslog-d45a286f2dee3c3d5aefef1ac16a02578c95f574.zip
Merge branch 'v3-stable' into beta
Conflicts: doc/property_replacer.html tools/syslogd.c
Diffstat (limited to 'runtime/vmop.h')
0 files changed, 0 insertions, 0 deletions