fix issue with manual merge conflict
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 29 Apr 2015 12:23:13 +0000 (08:23 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 29 Apr 2015 12:23:13 +0000 (08:23 -0400)
commit80ae2bbe23a35e362d31e115d4a81ba17149426a
tree515c069b8b04bbfc383ca7f22f1d3c17267bfa81
parent2828dcaaf9e1c56fb66df09e0994a5bdc8121658
fix issue with manual merge conflict
libs/canvas/canvas/text.h