aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorU-Fish-PC\Daniel <corrnondacqb@yahoo.com>2013-09-16 13:12:42 -0400
committerU-Fish-PC\Daniel <corrnondacqb@yahoo.com>2013-09-16 13:12:42 -0400
commit4000d7a23ab9a9d46bea6e937ab12d63c3194b89 (patch)
treed7f66337ea36fb300f7fc053ba572d05995b5a2f /.gitignore
parentgive consistency to map names (diff)
parentrevert pokemontools to 7aa016fb (diff)
downloadpokeyellow-4000d7a23ab9a9d46bea6e937ab12d63c3194b89.tar.gz
pokeyellow-4000d7a23ab9a9d46bea6e937ab12d63c3194b89.tar.xz
pokeyellow-4000d7a23ab9a9d46bea6e937ab12d63c3194b89.zip
Merge branch 'master' into comments
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 671d30b3..aaab40fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,7 @@
.*.swp
# no data from extras/
-extras/*.json
+*.json
# for any of the poor souls with save game files in their working directory
baserom.sgm