aboutsummaryrefslogtreecommitdiffstats
path: root/.dir-locals.el
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2017-02-08 11:35:18 +0100
committerRaimo Niskanen <[email protected]>2017-02-08 11:35:18 +0100
commitc41a6e8a377534158b4fcaf07c5b260d80221dbd (patch)
tree0bb33b29b50df7778f281270832a323fab5c3a58 /.dir-locals.el
parent83292f7263c29e6cb55ec7bad1c1fdc864cd6bcb (diff)
parentaa315e1cf1b79ab782e5b4c944595495ebf4e2f4 (diff)
downloadotp-c41a6e8a377534158b4fcaf07c5b260d80221dbd.tar.gz
otp-c41a6e8a377534158b4fcaf07c5b260d80221dbd.tar.bz2
otp-c41a6e8a377534158b4fcaf07c5b260d80221dbd.zip
Merge branch 'maint-19' into maint
Conflicts: OTP_VERSION
Diffstat (limited to '.dir-locals.el')
0 files changed, 0 insertions, 0 deletions