summaryrefslogtreecommitdiffstats
path: root/parse.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-04-16 17:01:16 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-04-16 17:01:16 +0200
commita1c7bc265554563d1744738994075214e5083566 (patch)
treeddf7c6676aa0de18b5986d7e56641465e83fe188 /parse.c
parentc5178a4d21cf8ca3362b8a8394d0e762801550a4 (diff)
parentd071de578454754c4701285b3569e55c5cef1ee4 (diff)
downloadrsyslog-a1c7bc265554563d1744738994075214e5083566.tar.gz
rsyslog-a1c7bc265554563d1744738994075214e5083566.tar.bz2
rsyslog-a1c7bc265554563d1744738994075214e5083566.zip
Merge branch 'runtime'
Conflicts: ChangeLog
Diffstat (limited to 'parse.c')
-rw-r--r--parse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/parse.c b/parse.c
index 171e5355..58458d62 100644
--- a/parse.c
+++ b/parse.c
@@ -3,7 +3,7 @@
*
* begun 2005-09-15 rgerhards
*
- * Copyright 2005
+ * Copyright 2005-2008
* Rainer Gerhards and Adiscon GmbH. All Rights Reserved.
*
* This file is part of rsyslog.