comparison pidgin/gtkconn.h @ 25988:2597de135090

Fix up merge (why can't it simply make the changes to my WD first?)
author Paul Aurich <paul@darkrain42.org>
date Sat, 07 Mar 2009 02:02:57 +0000
parents 6bf32c9e15a7
children
comparison
equal deleted inserted replaced
25987:c4fd9222dda1 25988:2597de135090