summaryrefslogtreecommitdiffstats
path: root/ctok.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-05-02 10:54:28 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-05-02 10:54:28 +0200
commitbc38a8cfb7ac8e4429cf934dc044fb8fdab4568a (patch)
tree7006b192e0e6f0559eca6b8227c5ac525d02da2f /ctok.c
parentca14951cd3caece93a0ad9d678c5dce8e26fd869 (diff)
parentb7c93404312849c35abe8a708fa2c0f2c4aabbbf (diff)
downloadrsyslog-bc38a8cfb7ac8e4429cf934dc044fb8fdab4568a.tar.gz
rsyslog-bc38a8cfb7ac8e4429cf934dc044fb8fdab4568a.tar.bz2
rsyslog-bc38a8cfb7ac8e4429cf934dc044fb8fdab4568a.zip
Merge branch 'v3-stable' into beta
Conflicts: configure.ac doc/manual.html
Diffstat (limited to 'ctok.c')
-rw-r--r--ctok.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ctok.c b/ctok.c
index 98d5b63b..de2bd8a8 100644
--- a/ctok.c
+++ b/ctok.c
@@ -8,6 +8,8 @@
*
* Module begun 2008-02-19 by Rainer Gerhards
*
+ * Copyright (C) 2008 by Rainer Gerhards and Adiscon GmbH.
+ *
* This file is part of the rsyslog runtime library.
*
* The rsyslog runtime library is free software: you can redistribute it and/or modify