Mercurial > pidgin
diff m4macros/purple.m4 @ 32129:0e94b0815349
This looks like a merge error. Fix it.
author | masca@cpw.pidgin.im |
---|---|
date | Wed, 07 Sep 2011 04:57:34 +0000 |
parents | 402236ee7981 |
children |
author | masca@cpw.pidgin.im |
---|---|
date | Wed, 07 Sep 2011 04:57:34 +0000 |
parents | 402236ee7981 |
children |