Mercurial > pidgin
comparison libpurple/protocols/novell/nmconference.c @ 26427:4103d15e4205
merge of '269d61606f225241d08360ffde046e471f03b833'
and '8c2755d7dda295a13479b339d8c3a21851906f70'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 03 Apr 2009 16:38:12 +0000 |
parents | 44b4e8bd759b |
children |
comparison
equal
deleted
inserted
replaced
26426:c8a495ad479b | 26427:4103d15e4205 |
---|