Mercurial > pidgin
diff doc/conversation-signals.dox @ 20378:9aa7b93ede27
propagate from branch 'im.pidgin.pidgin.2.2.1' (head 4df875eebff2a8d563baebf86297bd4bf0dc240a)
to branch 'im.pidgin.rlaager.merging.2_2_1_conflicts' (head 193dd268b0be5ca0a4a8fa0e4188452907114be0)
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 28 Sep 2007 19:45:05 +0000 |
parents | da2bab3b9fab |
children | e0613cf8c493 |