[fltk/f14: 10/10] Merge branch 'f15' into f14

[Rex Dieter]

commit 3b7d4a1cdf016fe526360cbd36ddd0a47c3e11f1
Merge: 3665b18 6dab24f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Aug 25 13:14:20 2011 -0500

    Merge branch 'f15' into f14
    
    Conflicts:
    	fltk.spec

 fltk-1.1.10-fluid_target.patch  |   12 ++++++++++++
 fltk-1.1.10-pkgconfig_xft.patch |    6 +++---
 fltk-config.sh                  |    2 +-
 fltk.spec                       |   37 ++++++++++++++++++++++++++++++-------
 4 files changed, 46 insertions(+), 11 deletions(-)
---