diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-09 14:40:26 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-09 14:40:26 +0100 |
| commit | a6df6a1740956b72acb7cbf9d17a51635ea18dfc (patch) | |
| tree | 35ff58dc4c818df504b7c5d1d38e6ccbcffb2f09 /Makefile.am | |
| parent | e983ea31b8d8af4916a60d4074ce4fb663e493a7 (diff) | |
| parent | c802afb7e0fc5e2c87af24e12bf63e4a0ba7688c (diff) | |
| download | rsyslog-a6df6a1740956b72acb7cbf9d17a51635ea18dfc.tar.gz rsyslog-a6df6a1740956b72acb7cbf9d17a51635ea18dfc.tar.xz rsyslog-a6df6a1740956b72acb7cbf9d17a51635ea18dfc.zip | |
Merge branch 'master' into master-solaris
Conflicts:
ChangeLog
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions