comparison pidgin/gtknotify.c @ 32132:5166e76265ae

merge of '3a12ece5b629e6de76faec79315514e70ccb32bb' and '4fdc7756ef147546eab68685a5d86c4b6db44a11'
author Paul Aurich <paul@darkrain42.org>
date Mon, 20 Jun 2011 05:53:59 +0000
parents d72d728226dc
children 7281d151e492 63fb41aa3dbe e1cc8d07fe07
comparison
equal deleted inserted replaced
32130:1d657ec53cdb 32132:5166e76265ae