Changeset d3307e2 for conf.h

Timestamp:

2005-12-13T23:07:05Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

6aaa221

Parents:

34759e6 (diff), b73ac9c (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 my storage fixes

File:

• conf.h (modified) (1 diff)

conf.h

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