summaryrefslogtreecommitdiffstats
path: root/plugins/imklog/linux.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-07-02 15:42:23 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-07-02 15:42:23 +0200
commitc53e6554b300880e4d8b4e8815ccbe5140eb8b2e (patch)
treec1206348535b0c94376f7c0e030f08bca9d927a9 /plugins/imklog/linux.c
parenta0496e7bd4cba22d2559adb50cd286f75cc6a40e (diff)
parent538543f6d0d4f279301bccf9a9c05ea6a02230a4 (diff)
downloadrsyslog-c53e6554b300880e4d8b4e8815ccbe5140eb8b2e.tar.gz
rsyslog-c53e6554b300880e4d8b4e8815ccbe5140eb8b2e.tar.xz
rsyslog-c53e6554b300880e4d8b4e8815ccbe5140eb8b2e.zip
Merge branch 'v3-stable' into beta
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'plugins/imklog/linux.c')
0 files changed, 0 insertions, 0 deletions