Merging master into branch.

Merge branch 'master' into topic/gilbert/plugin-api-tweak
This commit is contained in:
Gilbert Clark 2014-10-01 21:19:02 -04:00
commit 0104d7147d
152 changed files with 4474 additions and 2552 deletions

View file

@ -9,6 +9,7 @@
#include "config.h"
#include "analyzer/Component.h"
#include "file_analysis/Component.h"
#include "iosource/Component.h"
// We allow to override this externally for testing purposes.
#ifndef BRO_PLUGIN_API_VERSION