Mercurial > pidgin
comparison libpurple/protocols/oscar/family_odir.c @ 23060:0830ab50c463
merge of '000a0fa4bca9f18691f0a61e01bbac1aa76437c1'
and '54416c3a9ed80862d700c73b4a62bffe02e23534'
author | SHiNE CsyFeK <csyfek@gmail.com> |
---|---|
date | Sun, 29 Jun 2008 14:25:09 +0000 |
parents | ab2322195dab |
children | 9c0ee2491ed1 |
comparison
equal
deleted
inserted
replaced
23059:7b7744995791 | 23060:0830ab50c463 |
---|