diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-01 16:09:59 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-01 16:09:59 +0200 |
| commit | 1b6d14f8aba6ee302c9fe063ddf900305eaefeb3 (patch) | |
| tree | 719aee5e69ff1dd9dcd1ae3add59febda1c86499 /tools/pidfile.h | |
| parent | f4ec11fa779e7348f68ece1b3b50d499a0526ace (diff) | |
| parent | 9020647cdcdb0ef132491838e36c870f4e4e90ea (diff) | |
| download | rsyslog-1b6d14f8aba6ee302c9fe063ddf900305eaefeb3.tar.gz rsyslog-1b6d14f8aba6ee302c9fe063ddf900305eaefeb3.tar.xz rsyslog-1b6d14f8aba6ee302c9fe063ddf900305eaefeb3.zip | |
Merge branch 'v5-stable' into v5-beta
Conflicts:
runtime/queue.c
Diffstat (limited to 'tools/pidfile.h')
0 files changed, 0 insertions, 0 deletions