diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-05 09:54:42 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-05 09:54:42 +0100 |
| commit | 40be6cb6e7a167402039d24e047c94bdb19bd22e (patch) | |
| tree | a254249ee29f09c88ee82990d2049ede0ffabb07 /runtime/nssel.c | |
| parent | 424de9fb94725769cfcbb0f0a5937781376c4e73 (diff) | |
| parent | 396e211e5cfd195b7135947d425b089a0447fa88 (diff) | |
| download | rsyslog-40be6cb6e7a167402039d24e047c94bdb19bd22e.tar.gz rsyslog-40be6cb6e7a167402039d24e047c94bdb19bd22e.tar.bz2 rsyslog-40be6cb6e7a167402039d24e047c94bdb19bd22e.zip | |
Merge branch 'v4-stable-solaris' into master-solaris
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tests/rt-init.c
Diffstat (limited to 'runtime/nssel.c')
0 files changed, 0 insertions, 0 deletions