Merge remote-tracking branch 'origin/master'

# Conflicts:
#	PersonalInfo/PersonalInfo.cs
This commit is contained in:
Kaphotics 2016-07-17 22:40:12 -07:00
commit 475d2e877e

View file

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