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

This commit is contained in:
Robin Sommer 2014-07-31 14:45:38 -07:00
commit 0ba4b768cd
12 changed files with 107 additions and 60 deletions

View file

@ -898,6 +898,7 @@ int main(int argc, char** argv)
init_general_global_var();
init_net_var();
init_builtin_funcs_subdirs();
plugin_mgr->InitBifs();