Mercurial > pidgin.yaz
diff libpurple/core.h @ 19122:6dded98d1c80
Fixed a merge error
author | Eric Polino <aluink@pidgin.im> |
---|---|
date | Fri, 29 Jun 2007 02:58:27 +0000 |
parents | 41ae5efe745c |
children | 9db52d9b8436 2177a11e169d |
author | Eric Polino <aluink@pidgin.im> |
---|---|
date | Fri, 29 Jun 2007 02:58:27 +0000 |
parents | 41ae5efe745c |
children | 9db52d9b8436 2177a11e169d |