diff options
| author | Sanky <gsanky@gmail.com> | 2013-10-21 20:24:46 +0200 |
|---|---|---|
| committer | Sanky <gsanky@gmail.com> | 2013-10-21 20:24:46 +0200 |
| commit | b5268ab9207f02574abe8d6f5407e25f4a86365a (patch) | |
| tree | adce2892dd4c07781f2db42854e30fc25dba8b15 /.gitignore | |
| parent | AskForMonNickname (diff) | |
| parent | Fix CheckIfInOutsideMap comments. (diff) | |
| download | pokeyellow-b5268ab9207f02574abe8d6f5407e25f4a86365a.tar.gz pokeyellow-b5268ab9207f02574abe8d6f5407e25f4a86365a.tar.xz pokeyellow-b5268ab9207f02574abe8d6f5407e25f4a86365a.zip | |
Merge remote-tracking branch 'kanzure/master' into mergetastic
Conflicts:
main.asm
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |