diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-16 17:01:16 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-16 17:01:16 +0200 |
commit | a1c7bc265554563d1744738994075214e5083566 (patch) | |
tree | ddf7c6676aa0de18b5986d7e56641465e83fe188 /parse.c | |
parent | c5178a4d21cf8ca3362b8a8394d0e762801550a4 (diff) | |
parent | d071de578454754c4701285b3569e55c5cef1ee4 (diff) | |
download | rsyslog-a1c7bc265554563d1744738994075214e5083566.tar.gz rsyslog-a1c7bc265554563d1744738994075214e5083566.tar.bz2 rsyslog-a1c7bc265554563d1744738994075214e5083566.zip |
Merge branch 'runtime'
Conflicts:
ChangeLog
Diffstat (limited to 'parse.c')
-rw-r--r-- | parse.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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. |