aed5f3 Merge branch 'master' into f15.

Merged and Committed by Paul Flo Williams 8 years ago
    Merge branch 'master' into f15.
    Updates to 20110222 and fixes bug #688470 (obsolete sources)
    and bug #660376 (charview crash)
    
    Conflicts:
    	fontforge.spec
    
        
file modified
+2 -0
file removed
-10
file modified
+14 -19
file removed
-11
file modified
+2 -2