Mercurial > pidgin
diff acinclude.m4 @ 25209:e3bb0bbfa388
Fix merge
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Tue, 02 Dec 2008 22:55:49 +0000 |
| parents | 0d4a41a50168 |
| children |
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Tue, 02 Dec 2008 22:55:49 +0000 |
| parents | 0d4a41a50168 |
| children |