summaryrefslogtreecommitdiffstats
path: root/solaris
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-07-24 12:48:39 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-07-24 12:48:39 +0200
commitcf100be58c69e34f42b15c03b6104139d37eb47b (patch)
treec6ea5b5eb7e6b6080498ef03882aa54cda417c9b /solaris
parent87311d12771fc94e2d324e73922bd5e0b07de64e (diff)
parent686270440c601d5a4e3eac246397f60248889f5f (diff)
downloadrsyslog-cf100be58c69e34f42b15c03b6104139d37eb47b.tar.gz
rsyslog-cf100be58c69e34f42b15c03b6104139d37eb47b.tar.xz
rsyslog-cf100be58c69e34f42b15c03b6104139d37eb47b.zip
Merge branch 'beta'
Conflicts: ChangeLog configure.ac
Diffstat (limited to 'solaris')
0 files changed, 0 insertions, 0 deletions