53dbefa Merge branch 'master' of ssh://pkgs.fedoraproject.org/fcitx

Merged and Committed by Liang Suilong 11 years ago
1 file changed. 4 lines added. 1 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/fcitx
    
    Conflicts:
    	fcitx.spec
    
        
file modified
+4 -1