Merge remote branch 'origin/master' into topic/seth/ssl-binpac

This commit is contained in:
Seth Hall 2011-04-22 09:53:25 -04:00
commit 6826b58fb4
281 changed files with 23194 additions and 7359 deletions

View file

@ -262,6 +262,7 @@ TableType* id_table;
#include "const.bif.netvar_def"
#include "types.bif.netvar_def"
#include "event.bif.netvar_def"
#include "logging.bif.netvar_def"
void init_event_handlers()
{
@ -317,6 +318,7 @@ void init_net_var()
{
#include "const.bif.netvar_init"
#include "types.bif.netvar_init"
#include "logging.bif.netvar_init"
conn_id = internal_type("conn_id")->AsRecordType();
endpoint = internal_type("endpoint")->AsRecordType();