diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-13 15:52:45 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-13 15:52:45 +0200 |
| commit | 47ca77faca5442014309e6d2ffa3c0484d160da4 (patch) | |
| tree | 6ed6d602f8a0a282a632574f565bd3104e045f9d /.gitignore | |
| parent | 6fff4ae3329e852586f3a14ac8b8369bc6d61148 (diff) | |
| parent | ef9722ec87c8a7ddb2d499c1e7863475d8790a94 (diff) | |
| download | rsyslog-47ca77faca5442014309e6d2ffa3c0484d160da4.tar.gz rsyslog-47ca77faca5442014309e6d2ffa3c0484d160da4.tar.xz rsyslog-47ca77faca5442014309e6d2ffa3c0484d160da4.zip | |
Merge branch 'v3-stable' into v4-beta
Conflicts:
ChangeLog
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions