diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-03 12:05:50 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-03 12:05:50 +0200 |
| commit | 22328c72aef2df73741afefe0e8b53d3ad83f15d (patch) | |
| tree | 4a0b311508ebb28a0dc72e12993f704c2709d46a /freebsd | |
| parent | da933a7e105acf814d5e7955d39d29eab3a96613 (diff) | |
| parent | 7c0ca7553738161c681c0d0600de99e9fabee81d (diff) | |
| download | rsyslog-22328c72aef2df73741afefe0e8b53d3ad83f15d.tar.gz rsyslog-22328c72aef2df73741afefe0e8b53d3ad83f15d.tar.xz rsyslog-22328c72aef2df73741afefe0e8b53d3ad83f15d.zip | |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
runtime/datetime.c
Diffstat (limited to 'freebsd')
0 files changed, 0 insertions, 0 deletions