Fix annobin merge unresolved conflicts
[platform/upstream/linaro-gcc.git] / .dir-locals.el
2013-10-20 mrsMerge in trunk.
2013-10-16 mrs * .dir-locals.el: Add.