Mercurial > pidgin.yaz
diff configure.ac @ 30951:090e141a5214
Some merge-resolving...
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Fri, 08 Jan 2010 23:33:44 +0000 |
parents | d558d141aaae |
children | 4491a662d527 3b85df6d407c c38f6e6bf4ce |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Fri, 08 Jan 2010 23:33:44 +0000 |
parents | d558d141aaae |
children | 4491a662d527 3b85df6d407c c38f6e6bf4ce |