Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-15 08:47:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source 
# Conflicts:
#	PersonalInfo/PersonalInfo.cs
This commit is contained in:
Kaphotics 2016-07-17 22:40:12 -07:00
commit 475d2e877e
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
PKHeX.csproj
View file

@ -95,6 +95,7 @@
<Compile Include="PersonalInfo\PersonalInfoG4.cs" /> <Compile Include="PersonalInfo\PersonalInfoG4.cs" />
<Compile Include="PersonalInfo\PersonalInfoORAS.cs" /> <Compile Include="PersonalInfo\PersonalInfoORAS.cs" />
<Compile Include="PersonalInfo\PersonalInfoXY.cs" /> <Compile Include="PersonalInfo\PersonalInfoXY.cs" />
<Compile Include="PersonalInfo\PersonalTable.cs" />
<Compile Include="PKM\PKM.cs" /> <Compile Include="PKM\PKM.cs" />
<Compile Include="PKM\PKMConverter.cs" /> <Compile Include="PKM\PKMConverter.cs" />
<Compile Include="PKM\ShowdownSet.cs" /> <Compile Include="PKM\ShowdownSet.cs" />