merged the modularization branch (credentials) back to trunk

This commit is contained in:
Martin Willi
2008-03-13 14:14:44 +00:00
parent 2df655134c
commit 552cc11b1f
495 changed files with 30378 additions and 23843 deletions
+1 -1
View File
@@ -589,7 +589,7 @@ int main (int argc, char **argv)
}
if (starter_charon_pid())
{
starter_stroke_add_conn(conn);
starter_stroke_add_conn(cfg, conn);
}
if (starter_pluto_pid())
{