diff src/composite.c @ 91722:91863446e5d0

Remove bogus merge relicts from previous commit.
author Reiner Steib <Reiner.Steib@gmx.de>
date Sun, 10 Feb 2008 14:08:03 +0000
parents 606f2d163a64
children 462b9983854e
line wrap: on
line diff