Mercurial > pidgin.yaz
diff libpurple/whiteboard.h @ 29670:a0668fbf2483
Manual merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:53:53 +0000 |
parents | 6bf32c9e15a7 |
children | cea77667da7d |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:53:53 +0000 |
parents | 6bf32c9e15a7 |
children | cea77667da7d |