ba2a2c3 Merge branch 'master' into f18

Merged and Committed by than 11 years ago
    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	kcalc.spec
    	sources
    
        
file modified
+1 -0
kcalc-4.9.90-misc.patch kcalc-4.9.2-misc.patch
file renamed
+11 -21
file modified
+24 -5
file modified
+1 -1