diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2006-12-22 18:17:08 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2006-12-22 18:17:08 +0100 |
| commit | a3a37787188b68d17549e4db1ac1561cf7541979 (patch) | |
| tree | a3a92487ab990d07e9c8d49db4edf0c04034718e /conf.c | |
| parent | 55078f59c8e9f52f1d10bed55511e5e58ec3e53b (diff) | |
| parent | bd28e6a2eec0333a866ef2e380d32b1e6ad0c80b (diff) | |
| parent | a51be6448b7a6aa100f27873ce40b835068a66a7 (diff) | |
Merging trees.