diff options
author | Jonathan Arnett <jonarnett90@gmail.com> | 2016-01-16 09:54:46 -0500 |
---|---|---|
committer | Jonathan Arnett <jonarnett90@gmail.com> | 2016-01-16 09:54:46 -0500 |
commit | 10ab4eff069d024c4bb6399c2d71812d80f052be (patch) | |
tree | 80c3040f98f1e1ecad3e6517f74a6d3101b97627 /.gitignore | |
parent | 2de371564ddecfdb08f848bc9eeeff9808645206 (diff) | |
parent | 9487e92a6e35383dddc47794462cd37ff77c4256 (diff) |
Merge branch 'master' into j3rn-keymap
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index f3f46872a0..bae2658b00 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ *.lst *.map *.sym +*.swp tags *~ build/ |