Changeset be999a5 for doc/README


Ignore:
Timestamp:
2010-08-23T23:12:24Z (14 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
ad2d8bc
Parents:
237eadd (diff), eb6df6a (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:

First step in this merge. Mostly a bzr merge and then a cleanup of conflicts
and parts I want to/have to redo (because of ui-fix).

File:
1 edited

Legend:

Unmodified
Added
Removed

  • doc/README

    r237eadd rbe999a5  
    6666BitlBee's only real dependency is GLib. This is available on virtually every
    6767platform. Any recent version of GLib (2.4 or higher) will work.
     68
     69Off-the-Record encryption support will be included by default if the
     70configure script finds libotr in one of the usual places. You can pass
     71--otr=1 or --otr=0 to force it on or off, respectively.
    6872
    6973These days, MSN Messenger clients have to connect to the MS Passport servers
    … …  
    145149
    146150
    147 A NOTE ON ENCRYPTION
    148 ====================
     151A NOTE ON PASSWORD ENCRYPTION
     152=============================
    149153
    150154There used to be a note here about the simple obfuscation method used to
Note: See TracChangeset for help on using the changeset viewer.