diff console/gntft.c @ 15683:58392653a1bd

Sean didn't clean up some merge gunk, it looks like
author Ethan Blanton <elb@pidgin.im>
date Fri, 23 Feb 2007 16:25:32 +0000
parents 35fa1d1c4ef2
children
line wrap: on
line diff