Mercurial > pidgin.yaz
comparison pidgin/pidginstock.h @ 20509:642f08c49042
explicit merge of 'b9e805b43e8543af0b4800e2e5553c85d947c610'
and '85472e3c3dd9b1f401f415ad82bf18dd5a2f15a5'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sun, 16 Sep 2007 17:58:40 +0000 |
parents | 2f0960548c1d |
children | 44b4e8bd759b |
comparison
equal
deleted
inserted
replaced
20508:34abe3faeaab | 20509:642f08c49042 |
---|