diff options
author | Bryan Bishop <kanzure@gmail.com> | 2013-09-12 21:40:30 -0700 |
---|---|---|
committer | Bryan Bishop <kanzure@gmail.com> | 2013-09-12 21:40:30 -0700 |
commit | 0a9ccaebbbb7853034b3b0b22fc645e8b4af30b0 (patch) | |
tree | ad6bbc5128317edd08b2572a7077c1103ba4b9a5 | |
parent | 9830c9dc0a20a3fb567bc8b4ed554d3b0de043d4 (diff) | |
parent | c80af2798ee369a775d26a6f0d57853c7a91d918 (diff) |
Merge pull request #29 from kanzure/fix-json-gitignore
Allow (some) json files in the repo
-rw-r--r-- | .gitignore | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -23,8 +23,8 @@ # swap files for gedit *~ -# no data from extras/ -*.json +# labels.json is auto-generated by gbz80disasm +labels.json # for vim configuration # url: http://www.vim.org/scripts/script.php?script_id=441 |