summaryrefslogtreecommitdiff
path: root/.dir-locals.el
diff options
context:
space:
mode:
authorMaria Matejka <mq@ucw.cz>2022-03-09 13:49:31 +0100
committerMaria Matejka <mq@ucw.cz>2022-03-09 13:49:31 +0100
commit4eeae48214bde9807e8b3312f5a7a5de9f2f1b42 (patch)
treec855923f61954acdc8e9785951e7478df8c65e41 /.dir-locals.el
parent01c9f3d78e596336434fd313e4ed8bdc8db248b6 (diff)
parent56c8f2f03a8631417dc3b730625c08ffca42ead2 (diff)
Merge commit '56c8f2f0' into haugesund
Conflicts: nest/route.h nest/rt-table.c
Diffstat (limited to '.dir-locals.el')
0 files changed, 0 insertions, 0 deletions