Mercurial > pidgin
comparison libpurple/status.h @ 20518:4b20ec37460f
explicit merge of '753ac22f1fb1d33ecd437bdc3c63ca4f5bd81514'
and 'd3a05f1641322311d88741a6039ceacaecd21977'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sun, 16 Sep 2007 18:07:27 +0000 |
parents | 481749fc0b6b |
children | 5913725cbcd6 37f3c1023a68 |
comparison
equal
deleted
inserted
replaced
19992:e4dc98b8e140 | 20518:4b20ec37460f |
---|