summaryrefslogtreecommitdiffstats
path: root/action.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-03-25 08:26:18 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-03-25 08:26:18 +0100
commit648e84cad86a94d2f21ceed37e020fbed6a27b9d (patch)
tree93f9dcff68b5aadd41f9b4ff8e919a0faa37979e /action.c
parent2f8b5cafd0dcc5f09b7b64f5015a2aebd1c7b31c (diff)
parent841f841ce12e49659966db006f3f244e1f23b70e (diff)
downloadrsyslog-648e84cad86a94d2f21ceed37e020fbed6a27b9d.tar.gz
rsyslog-648e84cad86a94d2f21ceed37e020fbed6a27b9d.tar.bz2
rsyslog-648e84cad86a94d2f21ceed37e020fbed6a27b9d.zip
Merge branch 'v4-stable' into v4-stable-solaris
Conflicts: ChangeLog
Diffstat (limited to 'action.c')
-rw-r--r--action.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/action.c b/action.c
index 7cafb5e7..724dea4b 100644
--- a/action.c
+++ b/action.c
@@ -4,7 +4,7 @@
*
* File begun on 2007-08-06 by RGerhards (extracted from syslogd.c)
*
- * Copyright 2007-2009 Rainer Gerhards and Adiscon GmbH.
+ * Copyright 2007-2010 Rainer Gerhards and Adiscon GmbH.
*
* This file is part of rsyslog.
*