Mercurial > pidgin
comparison libpurple/protocols/oscar/family_stats.c @ 20311:66b73b0def79
This asked me to do a 3way merge in vim. Someone should check it.
applied changes from 614efd22968bb59c279872f991d97f3053ded4f0
through cbefbdeb71c4fe12f131d0932abeaf81bea091cb
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Fri, 19 Oct 2007 17:18:40 +0000 |
| parents | 44b4e8bd759b |
| children | 9c0ee2491ed1 |
comparison
equal
deleted
inserted
replaced
| 20310:311000f10bb0 | 20311:66b73b0def79 |
|---|