diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-02 17:18:43 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-02 17:18:43 +0200 |
| commit | 90ed676c54c05cc87f0dbde96447abc8efc166d8 (patch) | |
| tree | 06bba2fa1e6fd8e5ed70c13657f8c17ccd07a65a /dirty.h | |
| parent | e9c659c1578a114fa6e0d9cdf2729b60ba078a91 (diff) | |
| parent | b37a1eb0f8422102c11c597f15139d64c2d51c13 (diff) | |
| download | rsyslog-90ed676c54c05cc87f0dbde96447abc8efc166d8.tar.gz rsyslog-90ed676c54c05cc87f0dbde96447abc8efc166d8.tar.xz rsyslog-90ed676c54c05cc87f0dbde96447abc8efc166d8.zip | |
Merge branch 'master' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'dirty.h')
0 files changed, 0 insertions, 0 deletions