diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-24 11:25:22 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-24 11:25:22 +0100 |
| commit | 600bc06638f0508775be4a78bb85f15bd6025a2c (patch) | |
| tree | 7e6e023d5934846051b55bab39764106a6406c45 /java | |
| parent | 0a24b3afc093e16038da170458e2ecb68b363bdd (diff) | |
| parent | 925504d565c6cf4a712dd8c8217891662aaf639e (diff) | |
| download | rsyslog-600bc06638f0508775be4a78bb85f15bd6025a2c.tar.gz rsyslog-600bc06638f0508775be4a78bb85f15bd6025a2c.tar.xz rsyslog-600bc06638f0508775be4a78bb85f15bd6025a2c.zip | |
Merge branch 'v3-stable' into v4-stable
Conflicts:
ChangeLog
configure.ac
Diffstat (limited to 'java')
0 files changed, 0 insertions, 0 deletions