c90dad6 - fix multilib conflict, based on a patch by Rex Dieter (rhbz#477684)

Authored and Committed by rathann 14 years ago
    - fix multilib conflict, based on a patch by Rex Dieter (rhbz#477684)
    - update to SVN r1184
    - move TODO to devel docs
    
        
file modified
+1 -1
file modified
+13 -6
file modified
+1 -1