comparison doc/Makefile.am @ 19137:51772173a916

Fixed a few merge errors
author Eric Polino <aluink@pidgin.im>
date Fri, 06 Jul 2007 01:08:22 +0000
parents 61ddeb85ab86
children c3e80350c270
comparison
equal deleted inserted replaced
19136:6b85cbfc80b7 19137:51772173a916