diff COPYRIGHT @ 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 0d31b54d885a
children 97fcd4429c2f 74befdcd0454
line wrap: on
line diff