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