diff finch/finch.c @ 20311:66b73b0def79

This asked me to do a 3way merge in vim. Someone should check it. applied changes from 614efd22968bb59c279872f991d97f3053ded4f0 through cbefbdeb71c4fe12f131d0932abeaf81bea091cb
author Luke Schierer <lschiere@pidgin.im>
date Fri, 19 Oct 2007 17:18:40 +0000
parents de68625c4c04
children 3cc856ca2338
line wrap: on
line diff