dionmoustos/Pokemon-Firered
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
jiangzhengwenjz committed 2019-06-26 05:13:48 +08:00
2 parents 1182626739 fd543fd799
commit 1f82c7cbd5
3 files changed
+25 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.gitignore
+1
View File
@@ -43,4 +43,5 @@ build/
*.pl
*.bak
src/data/items.h
src/data/items.h # Autogenerated by jsonproc
tools/br_ips/{br_ips,ips_patch}{,.exe}