Mercurial > pidgin
diff doc/Makefile.am @ 30520:025fe823a921
Fix merge and a compilation error
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Sun, 14 Feb 2010 22:42:11 +0000 |
parents | 76a689608a83 |
children |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Sun, 14 Feb 2010 22:42:11 +0000 |
parents | 76a689608a83 |
children |