comparison Makefile.am @ 25579:52c50f8a978e

merge of '0d0a22730c3a0782d275ea2ad549bf3d93c70700' and '1f7289ec41898b40159870ac726cf573812ce4e3'
author Ethan Blanton <elb@pidgin.im>
date Wed, 29 Apr 2009 00:43:26 +0000
parents e0a6a829df87
children 4b8c4870b13a
comparison
equal deleted inserted replaced
25574:1784eb0d66c0 25579:52c50f8a978e