Changeset 41ca004 for conf.c

Timestamp:

2006-05-19T07:55:53Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

68b518d6

Parents:

ac83732 (diff), 881fd4e (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:

Merging from main development tree.

File:

• conf.c (modified) (1 diff)

conf.c

@@ -95 +95 @@
                         conf->port = i;
                 }
-                else if( opt == 'p' )
+                else if( opt == 'P' )
                 {
                         g_free( conf->pidfile );