diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-12 15:11:38 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-12 15:11:38 +0200 |
| commit | 63994d092c3567030b96d28dbdc3db5f0e22fba2 (patch) | |
| tree | 42d94ec95dc0231b0a8a86c52fd9605e524e6b09 /runtime/stream.h | |
| parent | 2082d963975a88c8e4dee3a43b98d939f9a2323f (diff) | |
| parent | c04f196e25d63a7f45bf2ad79b48019fed98e5c9 (diff) | |
| download | rsyslog-63994d092c3567030b96d28dbdc3db5f0e22fba2.tar.gz rsyslog-63994d092c3567030b96d28dbdc3db5f0e22fba2.tar.xz rsyslog-63994d092c3567030b96d28dbdc3db5f0e22fba2.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
runtime/datetime.h
runtime/rsyslog.h
Diffstat (limited to 'runtime/stream.h')
0 files changed, 0 insertions, 0 deletions