Mercurial > pidgin.yaz
diff finch/gntprefs.c @ 26001:9115f71ad73a
Fixing busted merge
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 07 Mar 2009 22:40:30 +0000 |
parents | c38d72677c8a |
children | f7c5bb2f6623 cc1e35fa774d |
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 07 Mar 2009 22:40:30 +0000 |
parents | c38d72677c8a |
children | f7c5bb2f6623 cc1e35fa774d |