summaryrefslogtreecommitdiff
path: root/target/config/Config.in.x86.choice
AgeCommit message (Collapse)Author
2014-05-23resolve merge conflictWaldemar Brodkorb