Mercurial > pidgin
comparison COPYRIGHT @ 30518:090e141a5214
Some merge-resolving...
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Fri, 08 Jan 2010 23:33:44 +0000 |
parents | 69aa4660401a |
children | a158ef76d340 |
comparison
equal
deleted
inserted
replaced
30516:d4ec9ba82814 | 30518:090e141a5214 |
---|