From c80af2798ee369a775d26a6f0d57853c7a91d918 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Thu, 12 Sep 2013 00:46:21 -0500
Subject: allow (some) json files in the repo

This ignores only "labels.json", which so far has been the only
problematic json file. This is a file generated by gbz80disasm.

Other json files might be necessary in the future, and it's okay to let
them in.
---
 .gitignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index a8b43a7..34a7196 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
-- 
cgit v1.2.3