Mercurial > pidgin.yaz
diff .mtn-ignore @ 29669:23f07a817807
Manual merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:52:16 +0000 |
parents | 42fe79ca351d |
children | 10e1f3c1d0db 2c95b7c57ebb |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:52:16 +0000 |
parents | 42fe79ca351d |
children | 10e1f3c1d0db 2c95b7c57ebb |