Merge remote-tracking branch 'refs/remotes/origin/Beta-Build'

brianzhouzc · Aug 16, 2016 · fc7b4f6 · fc7b4f6
2 parents 9710345 + 0cc8d40
commit fc7b4f6
Show file tree

Hide file tree

Showing 521 changed files with 4,383 additions and 1,232 deletions.
diff --git a/DeviceSettingForm.png b/DeviceSettingForm.png
diff --git a/MainForm.png b/MainForm.png
diff --git a/PokemonGo/RocketAPI/Helpers/Utils.cs b/PokemonGo/RocketAPI/Helpers/Utils.cs
diff --git a/PokemonGo/RocketAPI/Window/Extensions.cs b/PokemonGo/RocketAPI/Window/Extensions.cs
diff --git a/PokemonGo/RocketAPI/Window/ItemBox.cs b/PokemonGo/RocketAPI/Window/ItemBox.cs
diff --git a/PokemonGo/RocketAPI/Window/ItemForm.cs b/PokemonGo/RocketAPI/Window/ItemForm.cs
diff --git a/PokemonGo/RocketAPI/Window/NicknamePokemonForm.cs b/PokemonGo/RocketAPI/Window/NicknamePokemonForm.cs