Changeset b135438 for conf.c


Ignore:
Timestamp:
2005-11-15T13:20:27Z (15 years ago)
Author:
Jelmer Vernooij <jelmer@…>
Branches:
master
Children:
c998255, f56c491
Parents:
f7f3ada (diff), c1ede6e8 (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 changes from Wilmer

File:
1 edited

Legend:

Unmodified
Added
Removed
  • conf.c

    rf7f3ada rb135438  
    22  * BitlBee -- An IRC to other IM-networks gateway                     *
    33  *                                                                    *
    4   * Copyright 2002-2004 Wilmer van der Gaast and others                *
     4  * Copyright 2002-2005 Wilmer van der Gaast and others                *
    55  \********************************************************************/
    66
Note: See TracChangeset for help on using the changeset viewer.