Changeset 643dfc4 for conf.c

Timestamp:

2005-12-17T01:25:58Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

e3fb678

Parents:

4146a07 (diff), 32c632f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge integration

File:

• conf.c (modified) (1 diff)

conf.c

@@ -55 +55 @@
         conf->password = NULL;
         conf->configdir = g_strdup( CONFIG );
+        conf->plugindir = g_strdup( PLUGINDIR );
         conf->motdfile = g_strdup( ETCDIR "/motd.txt" );
         conf->ping_interval = 180;