diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 14:09:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 14:09:06 +0200 |
| commit | 1be79730693be187e99319377cf110fba41cc801 (patch) | |
| tree | c09a297ad5e384ccd92d435b13c8a5c2fc11f110 /java | |
| parent | ae2d1c6fcb25867f2c6aa8e342a24afb43442e6a (diff) | |
| parent | 318adf58de35d7b8c6ca891b93c351220628586b (diff) | |
| download | rsyslog-1be79730693be187e99319377cf110fba41cc801.tar.gz rsyslog-1be79730693be187e99319377cf110fba41cc801.tar.xz rsyslog-1be79730693be187e99319377cf110fba41cc801.zip | |
Merge branch 'v4-stable' into v4-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'java')
0 files changed, 0 insertions, 0 deletions