0acbc1a Merge branch 'master' of ssh://pkgs.fedoraproject.org/vala

1 file Merged by salimma 13 years ago, Committed by Michel Alexandre Salim 13 years ago,
1 file changed. 4 lines added. 5 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/vala
    
    Conflicts:
    	.gitignore
    	sources
    	vala.spec
    
        
file modified
+4 -5