diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-30 18:56:43 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-30 18:56:43 +0200 |
| commit | 5ecc00336c2b7da02cd38f0f0cbc337ee628d59e (patch) | |
| tree | 2b685603016f834beb8847dc93d38334979dc13c /runtime/conf.h | |
| parent | aaffc4281e0b26f419a3fc341461f2fc479080b8 (diff) | |
| parent | a0496e7bd4cba22d2559adb50cd286f75cc6a40e (diff) | |
| download | rsyslog-5ecc00336c2b7da02cd38f0f0cbc337ee628d59e.tar.gz rsyslog-5ecc00336c2b7da02cd38f0f0cbc337ee628d59e.tar.xz rsyslog-5ecc00336c2b7da02cd38f0f0cbc337ee628d59e.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/conf.h')
0 files changed, 0 insertions, 0 deletions