diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-03 15:46:35 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-03 15:46:35 +0100 |
| commit | 4cefc40064a07f6c9c8ab8def2ecbb87b336debe (patch) | |
| tree | 8c4298451800487647b3ec566effa0a2ebef5481 /runtime/vm.c | |
| parent | 1fc8e4372bf0c7ccc7f54abe387933dc8a2de670 (diff) | |
| parent | 90455378415e06bfee9109c77b8a595da1326f78 (diff) | |
| download | rsyslog-4cefc40064a07f6c9c8ab8def2ecbb87b336debe.tar.gz rsyslog-4cefc40064a07f6c9c8ab8def2ecbb87b336debe.tar.xz rsyslog-4cefc40064a07f6c9c8ab8def2ecbb87b336debe.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
action.c
configure.ac
doc/manual.html
Diffstat (limited to 'runtime/vm.c')
0 files changed, 0 insertions, 0 deletions