Merge remote-tracking branch 'origin/master' into topic/robin/reader-writer-plugins

This commit is contained in:
Robin Sommer 2014-07-31 10:10:39 -07:00
commit 2b505b07c1
37 changed files with 91122 additions and 79726 deletions

View file

@ -933,9 +933,6 @@ int main(int argc, char** argv)
}
reporter->InitOptions();
init_general_global_var();
broxygen_mgr->GenerateDocs();
if ( user_pcap_filter )