mirror of
https://github.com/rsyslog/loganalyzer.git
synced 2025-09-26 03:09:21 +02:00
Fixed merge conflicts
Merge branch 'beta' Conflicts: ChangeLog src/include/functions_common.php
This commit is contained in:
commit
54dcacb25e
@ -1,4 +1,9 @@
|
||||
---------------------------------------------------------------------------
|
||||
Version 2.3.10 (beta), 2008-08-27
|
||||
- Fixed a few parsing issues with prior RFC 3164 syslog messages.
|
||||
These messages are now correctly parsed, or better do not cause
|
||||
any parsing problems anymore.
|
||||
---------------------------------------------------------------------------
|
||||
Version 2.5.4 (devel), 2008-08-05
|
||||
- Included fixed from Beta v2.3.9
|
||||
---------------------------------------------------------------------------
|
||||
|
Loading…
x
Reference in New Issue
Block a user