Robin Sommer eb637f9f3e Merge remote-tracking branch 'origin/master' into topic/robin/plugins ... Thanks to git this merge was less troublesome that I was afraid it would be. Not all tests pass yet though (and file hashes have changed unfortunately). Conflicts: cmake doc/scripts/DocSourcesList.cmake scripts/base/init-bare.bro scripts/base/protocols/ftp/main.bro scripts/base/protocols/irc/dcc-send.bro scripts/test-all-policy.bro src/AnalyzerTags.h src/CMakeLists.txt src/analyzer/Analyzer.cc src/analyzer/protocol/file/File.cc src/analyzer/protocol/file/File.h src/analyzer/protocol/http/HTTP.cc src/analyzer/protocol/http/HTTP.h src/analyzer/protocol/mime/MIME.cc src/event.bif src/main.cc src/util-config.h.in testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log testing/btest/Baseline/istate.events-ssl/receiver.http.log testing/btest/Baseline/istate.events-ssl/sender.http.log testing/btest/Baseline/istate.events/receiver.http.log testing/btest/Baseline/istate.events/sender.http.log		2013-05-16 17:58:48 -07:00
..
analyzer	More API documentation.	2013-04-16 14:28:23 -07:00
cluster	s/bro-ids.org/bro.org/g	2013-03-07 19:33:04 -08:00
communication	Merge remote-tracking branch 'vlad/info_record_fixes'	2012-07-13 16:20:49 -07:00
control	Enable Bro to communicate with peers over non-global IPv6 addresses.	2012-05-17 12:59:20 -05:00
dpd	First prototype of new analyzer framework.	2013-03-26 11:05:38 -07:00
file-analysis	Merge remote-tracking branch 'origin/master' into topic/robin/plugins	2013-05-16 17:58:48 -07:00
input	Merge remote-tracking branch 'origin/master' into topic/robin/plugins	2013-05-16 17:58:48 -07:00
intel	Fix some warnings from sphinx when building docs.	2012-11-15 16:40:18 -06:00
logging	Merge remote-tracking branch 'origin/master' into topic/robin/plugins	2013-05-16 17:58:48 -07:00
notice	Merge remote-tracking branch 'origin/topic/seth/notice-framework-updates'	2013-03-06 16:45:30 -08:00
packet-filter	Checkpoint after pass.	2012-02-15 13:07:08 -08:00
reporter	Change reporter messages to more reliably print to stderr.	2013-01-18 12:46:00 -06:00
signatures	remove the byte_len and length bifs	2013-03-06 13:45:42 -08:00
software	Update software version parsing and comparison to account for a third numeric subversion.	2013-02-06 13:59:05 -05:00
sumstats	Merge remote-tracking branch 'origin/topic/bernhard/metrics-samples'	2013-05-15 16:11:27 -07:00
tunnels	First prototype of new analyzer framework.	2013-03-26 11:05:38 -07:00