diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-16 14:18:20 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-16 14:18:20 +0200 |
commit | 140d5cf0f80c40ee8db3c7b24176e45b00be0572 (patch) | |
tree | 9dce9f9532d229f75444ea3ac64cbc2e0266b2b2 /vmprg.c | |
parent | 5453699428b8f5a7dd6ac23abe7b838dd19101b5 (diff) | |
parent | ccd426e0da2c5612d50f90abe140dcf7c5631748 (diff) | |
download | rsyslog-140d5cf0f80c40ee8db3c7b24176e45b00be0572.tar.gz rsyslog-140d5cf0f80c40ee8db3c7b24176e45b00be0572.tar.xz rsyslog-140d5cf0f80c40ee8db3c7b24176e45b00be0572.zip |
Merge branch 'v2-stable' into debian_lenny
Conflicts:
configure.ac
doc/manual.html
Diffstat (limited to 'vmprg.c')
0 files changed, 0 insertions, 0 deletions