diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-25 13:06:58 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-25 13:06:58 -0400 |
| commit | f48a34c93cd5eef445d94e98de3016728a10e663 (patch) | |
| tree | 72fe85a773b0f6c5fa713e5b1139354f50a7ad12 /.gitignore | |
| parent | Ignore 'dirty' changes to extras (diff) | |
| parent | Fix a reference to pcm.py. (diff) | |
| download | pokeyellow-f48a34c93cd5eef445d94e98de3016728a10e663.tar.gz pokeyellow-f48a34c93cd5eef445d94e98de3016728a10e663.tar.xz pokeyellow-f48a34c93cd5eef445d94e98de3016728a10e663.zip | |
Merge branch 'master' of https://github.com/pret/pokeyellow
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -19,6 +19,9 @@ *.1bpp *.pic +# converted audio data +*.pcm + # swap files for vim .*.swp @@ -53,7 +56,4 @@ replace.sh .lvimrc # extras is a submodule, don't include -extras - -# contains hack job of some scripts modified for personal use -extras1\
\ No newline at end of file +extras/ |