Mercurial > pidgin.yaz
comparison pidgin/gtkidle.c @ 20511:bced1f19cb1d
explicit merge of '996cf0c57149ba6e1c714ebb1f11d5d4bac8fb68'
and 'a50b5c8c98f4e121b414810d37417458e919de79'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sun, 16 Sep 2007 18:01:18 +0000 |
parents | 2d6aed3e7c2e |
children | 44b4e8bd759b |
comparison
equal
deleted
inserted
replaced
19652:e21002d106ab | 20511:bced1f19cb1d |
---|