diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-07 15:24:59 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-07 15:24:59 +0200 |
| commit | a6c743e5ec5d213d3aa6404553fe65d59f065799 (patch) | |
| tree | 8ec5ec4d77dea8a12280b965c2c5ba7f5051158f /runtime/vmprg.h | |
| parent | 7db9f96fe9ecb9f8e05d45cc888aa488d8aed85f (diff) | |
| parent | 845c6f59b91e9988f856556cbb0e88e275e8e591 (diff) | |
| download | rsyslog-a6c743e5ec5d213d3aa6404553fe65d59f065799.tar.gz rsyslog-a6c743e5ec5d213d3aa6404553fe65d59f065799.tar.xz rsyslog-a6c743e5ec5d213d3aa6404553fe65d59f065799.zip | |
Merge branch 'master' into nextmaster
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/vmprg.h')
0 files changed, 0 insertions, 0 deletions