summaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-08-07 10:28:40 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-08-07 10:28:40 +0200
commit66300192944fe2c4390e53549ed51b4b25e79524 (patch)
treebf63e3c3f11340a8bcf5ad82f1ba7b44156a5a1e /README
parentb829284f37add946ac810b125e3bededa1206c96 (diff)
parentb761fbb0f0c9d5cf253ad3f58f7d8486b5650e85 (diff)
downloadrsyslog-66300192944fe2c4390e53549ed51b4b25e79524.tar.gz
rsyslog-66300192944fe2c4390e53549ed51b4b25e79524.tar.xz
rsyslog-66300192944fe2c4390e53549ed51b4b25e79524.zip
Merge branch 'v3-stable' into beta
Conflicts: omfwd.c
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions