Changeset 643dfc4 for conf.h

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.h (modified) (1 diff)

conf.h

@@ -41 +41 @@
         char *hostname;
         char *configdir;
+        char *plugindir;
         char *motdfile;
         char *primary_storage;