Changeset bd69a21 for conf.h

Timestamp:

2005-12-15T12:24:25Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

4146a07

Parents:

2983f5e (diff), bf02a67 (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 Wilmer

File:

• conf.h (modified) (1 diff)

conf.h

@@ -42 +42 @@
         char *configdir;
         char *motdfile;
+        char *primary_storage;
+        char **migrate_storage;
         int ping_interval;
         int ping_timeout;