Mercurial > pidgin
diff libpurple/whiteboard.h @ 30939:9877f1307a0d
merge of '21547ef2d3fe0b84909cf441e8a0eff458724c91'
and '5564794af3dcdf5ee3ff698ebf4221072e6c8be7'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sun, 21 Nov 2010 09:40:48 +0000 |
parents | 6bf32c9e15a7 |
children | cea77667da7d 3828a61c44da |