Robin Sommer 630c256a72 Merge remote branch 'origin/topic/gilbert/ascii-header' ... * origin/topic/gilbert/ascii-header: Updated tests; removed net type from type conversion code. Updated header format (see #558) Header modification to LogWriterAscii to make it easier for scripts to understand bro log files. Notes: - I've refactored the code a bit, also adapting the style a bit. Also edited the header format slightly. - I'm skipping the testing/btest/profiles directory, which seems unrelated. - I'm also skipping the baseline updates as they weren't up-to-date anymore. Will update them in a subsequent commit.		2011-09-04 12:12:08 -07:00
..
ascii.bro	Merge remote branch 'origin/topic/gilbert/ascii-header'	2011-09-04 12:12:08 -07:00