Mercurial > pidgin.yaz
diff pidgin/gtkconn.h @ 26001:9115f71ad73a
Fixing busted merge
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 07 Mar 2009 22:40:30 +0000 |
parents | 6bf32c9e15a7 |
children |
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 07 Mar 2009 22:40:30 +0000 |
parents | 6bf32c9e15a7 |
children |