diff pidgin/gtkwhiteboard.c @ 19488:ebe2d2e71223

Fixed merge errors stemming from the fact that the main branch and my branch both added something to the prpl struct
author Andreas Monitzer <pidgin@monitzer.com>
date Tue, 28 Aug 2007 07:09:48 +0000
parents 78744359f57f
children 44b4e8bd759b
line wrap: on
line diff