Changeset e617b35


Ignore:
Timestamp:
2006-10-15T15:34:57Z (14 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
788a1af
Parents:
ee5c355 (diff), 3dc9d46 (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.

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • doc/user-guide/commands.xml

    ree5c355 re617b35  
    426426                <default>false</default>
    427427
    428                 <para>
    429                         With this option enabled, root will inform you when someone in your buddy list changes his/her "friendly name".
    430                 </para>
     428                <description>
     429                        <para>
     430                                With this option enabled, root will inform you when someone in your buddy list changes his/her "friendly name".
     431                        </para>
     432                </description>
    431433        </bitlbee-setting>
    432434
  • protocols/msn/msn.c

    ree5c355 re617b35  
    368368        struct msn_data *md;
    369369        char buf[1024], *fn;
    370         int i;
    371370       
    372371        /* Double-check. */
  • protocols/oscar/info.c

    ree5c355 re617b35  
    261261                if (!identified) {
    262262                        /*FIXME*/
     263                        /*REMOVEME :-)
    263264                        g_strdup_printf("unknown capability: {%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n",
    264265                                        cap[0], cap[1], cap[2], cap[3],
     
    268269                                        cap[10], cap[11], cap[12], cap[13],
    269270                                        cap[14], cap[15]);
    270                        
     271                        */
    271272                }
    272273
Note: See TracChangeset for help on using the changeset viewer.