diff options
| author | Andre Lorbach <alorbach@adiscon.com> | 2013-08-06 11:51:43 +0200 |
|---|---|---|
| committer | Andre Lorbach <alorbach@adiscon.com> | 2013-08-06 11:51:43 +0200 |
| commit | 7ffa4f675dd90c5ccb19d0cf4e11d543be9a2a6b (patch) | |
| tree | ed95195d9c69b1fa21323e224d2a4ab4d5f2a0e4 /runtime/rsyslog.h | |
| parent | 32ea9f6e0f8e5b301e173d7d06c81c2b80925c1d (diff) | |
| parent | fa54ce21a732916db5d62913dc77f7bb2cb6ad94 (diff) | |
| download | rsyslog-7ffa4f675dd90c5ccb19d0cf4e11d543be9a2a6b.tar.gz rsyslog-7ffa4f675dd90c5ccb19d0cf4e11d543be9a2a6b.tar.bz2 rsyslog-7ffa4f675dd90c5ccb19d0cf4e11d543be9a2a6b.zip | |
Merge branch 'v7-stable'
Conflicts:
plugins/omprog/omprog.c
Diffstat (limited to 'runtime/rsyslog.h')
0 files changed, 0 insertions, 0 deletions