diff src/intl-auto-encap-win32.h @ 5121:c6c982484f87 ben-lisp-object

manually resolve merge problem
author Ben Wing <ben@xemacs.org>
date Wed, 30 Dec 2009 04:27:30 -0600
parents 6765f2581182
children 50861fea97f6
line wrap: on
line diff