diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-16 19:02:49 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-16 19:02:49 +0200 |
| commit | c40898739485e0a407477b41d9eb3f925995ef17 (patch) | |
| tree | 453d18455b23405e18ac5603cbd9d2ea7160599b /.gitignore | |
| parent | 2014cf85627b8774e8c36ddecad04f1ebf43020b (diff) | |
| parent | 75079d9519c78c07004495f71ea347543a01f40e (diff) | |
| download | rsyslog-c40898739485e0a407477b41d9eb3f925995ef17.tar.gz rsyslog-c40898739485e0a407477b41d9eb3f925995ef17.tar.xz rsyslog-c40898739485e0a407477b41d9eb3f925995ef17.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions