fixed merge conflict
authorMatthias Kramm <kramm@quiss.org>
Fri, 26 Mar 2010 01:24:38 +0000 (18:24 -0700)
committerMatthias Kramm <kramm@quiss.org>
Fri, 26 Mar 2010 01:24:38 +0000 (18:24 -0700)
commitae1dd1444d4a816156dd6233dfdb2e2d57a88e05
tree070b30883d03c535403420380b6faab0a73d9dee
parent7599478924702568afb53a7a40fe66a13c61c1ed
fixed merge conflict
lib/filters/remove_font_transforms.c