Changeset 703f0f7 for unix.c


Ignore:
Timestamp:
2005-12-14T01:17:25Z (18 years ago)
Author:
Jelmer Vernooij <jelmer@…>
Branches:
master
Children:
547f937
Parents:
22bf64e (diff), 568aaf7 (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 pluginable branch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • unix.c

    r22bf64e r703f0f7  
    4747       
    4848        log_init( );
    49         nogaim_init( );
    50        
     49
     50        nogaim_init();
     51
    5152        CONF_FILE = g_strdup( CONF_FILE_DEF );
    5253       
Note: See TracChangeset for help on using the changeset viewer.