diff finch/finch.h @ 32113:4b53d875529f

fixed conflicts in previous merge.
author tdrhq@soc.pidgin.im
date Wed, 26 Aug 2009 03:19:30 +0000
parents f7c5bb2f6623
children
line wrap: on
line diff