diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-05-02 10:54:28 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-05-02 10:54:28 +0200 |
commit | bc38a8cfb7ac8e4429cf934dc044fb8fdab4568a (patch) | |
tree | 7006b192e0e6f0559eca6b8227c5ac525d02da2f /vm.h | |
parent | ca14951cd3caece93a0ad9d678c5dce8e26fd869 (diff) | |
parent | b7c93404312849c35abe8a708fa2c0f2c4aabbbf (diff) | |
download | rsyslog-bc38a8cfb7ac8e4429cf934dc044fb8fdab4568a.tar.gz rsyslog-bc38a8cfb7ac8e4429cf934dc044fb8fdab4568a.tar.xz rsyslog-bc38a8cfb7ac8e4429cf934dc044fb8fdab4568a.zip |
Merge branch 'v3-stable' into beta
Conflicts:
configure.ac
doc/manual.html
Diffstat (limited to 'vm.h')
0 files changed, 0 insertions, 0 deletions