diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-11 10:50:47 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-11 10:50:47 +0200 |
| commit | 44de250eca8568c775e27bd052752c884a4c2555 (patch) | |
| tree | 3b1af9ed481e378ad9d03030e0e5f891519afd72 /conf.h | |
| parent | 9584c81df387adcdcd7b84078eda48092049101d (diff) | |
| parent | 8fae8b6d86728e4786d1fde82006ac64aee0da63 (diff) | |
| download | rsyslog-44de250eca8568c775e27bd052752c884a4c2555.tar.gz rsyslog-44de250eca8568c775e27bd052752c884a4c2555.tar.xz rsyslog-44de250eca8568c775e27bd052752c884a4c2555.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
configure.ac
Diffstat (limited to 'conf.h')
0 files changed, 0 insertions, 0 deletions