Mercurial > pidgin
comparison doc/oscar/Receive_Codepaths.odg @ 25244:300cf4e16720
Fix merge
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 02 Jan 2009 19:31:16 +0000 |
parents | d4ffa29eaa4f |
children |
comparison
equal
deleted
inserted
replaced
25243:ae544623840b | 25244:300cf4e16720 |
---|