Mercurial > pidgin.yaz
diff pidgin/gtkstatusbox.h @ 25376:138c729f8c9a
explicit merge of 'c2a520001286f0c95c761be82c041c4379ddf407'
and '992be28ad76925d4927129b06b738ba938de82d6'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 02 Jan 2009 22:11:08 +0000 |
parents | 3a5ae157b730 |
children | 1a94a964bddf |