Mercurial > pidgin.yaz
diff libpurple/Makefile.am @ 20742:e055690438e7
explicit merge of '34bd82146ec66294912412630b2ae269d548064b'
and '17f03911cb3446c55f58db2c7b1ef404b52d22ec'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Mon, 01 Oct 2007 19:42:10 +0000 |
parents | a77432fe2f3b |
children | 57d350900136 034a03ae657b |