diff src/composite.c @ 109388:64d1dc916ed8

Fix previous conflict.
author Kenichi Handa <handa@etlken>
date Wed, 14 Jul 2010 12:53:53 +0900
parents 8cfee7d2955f
children 05e7e7c46ff0
line wrap: on
line diff