Mercurial > pidgin.yaz
comparison libpurple/plugins/Makefile.am @ 17168:c8ed8e351541
explicit merge of '751c46819c7edfd139753ceda847258389eee965'
and 'e39b5117f8df79ccfe2f383c3b0bbe8f33566991'
to branch 'im.pidgin.pidgin'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sat, 19 May 2007 07:51:03 +0000 |
parents | 0dcd915899ae |
children | 2729cdff43cd 315151da0dc6 |
comparison
equal
deleted
inserted
replaced
17121:fb35886b0d85 | 17168:c8ed8e351541 |
---|