diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-09 16:49:00 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-09 16:49:00 +0200 |
| commit | 848bd8f9d93c6913d8345b68637b66d2b6ea49d2 (patch) | |
| tree | 168a2cd93bc7bab2966bd2e5e79fbb4038b01322 /ctok_token.c | |
| parent | 39766091984b3669767e8742100876ebf8e3ea86 (diff) | |
| parent | f35197f1c2136b5e043cdf4776f99b4854bfcc5c (diff) | |
| download | rsyslog-848bd8f9d93c6913d8345b68637b66d2b6ea49d2.tar.gz rsyslog-848bd8f9d93c6913d8345b68637b66d2b6ea49d2.tar.xz rsyslog-848bd8f9d93c6913d8345b68637b66d2b6ea49d2.zip | |
Merge branch 'v2-stable' into v3-stable
Conflicts:
syslogd.c
Diffstat (limited to 'ctok_token.c')
0 files changed, 0 insertions, 0 deletions