diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-14 14:49:01 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-14 14:49:01 +0200 |
| commit | 85ccd6e9b78d9136d5df3e082d9e971e0b8a7ef1 (patch) | |
| tree | d36a73e60aa9dc497dc218c64d74d53268139fe3 /m4 | |
| parent | 01e5d51c57536acfa8e05d5b22c001a6cf0701d8 (diff) | |
| parent | 01f2c7a7a3ee394028eb36d9709490cbc26c7369 (diff) | |
| download | rsyslog-85ccd6e9b78d9136d5df3e082d9e971e0b8a7ef1.tar.gz rsyslog-85ccd6e9b78d9136d5df3e082d9e971e0b8a7ef1.tar.xz rsyslog-85ccd6e9b78d9136d5df3e082d9e971e0b8a7ef1.zip | |
Merge branch 'omprog' into nextmaster
Conflicts:
ChangeLog
runtime/rsyslog.h
Diffstat (limited to 'm4')
0 files changed, 0 insertions, 0 deletions