Merged DetectiveSquirrel/master into patrickbranch/master

Author Patrick Branch <branch.patrick@gmail.com>
Author date 2016-07-27 17:27:20
Author local date 2016-07-27 13:27:20 -0400
Committer Patrick Branch <branch.patrick@gmail.com>
Committer date 2016-07-27 17:27:20
Committer local date 2016-07-27 13:27:20 -0400
Commit 37e3d92d9e87fe067f685e8106c528ced6bc1ed3
Tree 9a96834817f0d761f2d87f4dcc7466ec9584dfa5
Parent 321921e4600844e11f18a69032058e21291bdb15
Merged DetectiveSquirrel/master into patrickbranch/master
Affected files:
PokemonGo/RocketAPI/Window/MainForm.Designer.cs
PokemonGo/RocketAPI/Window/MainForm.cs
PokemonGo/RocketAPI/Window/MainForm.resx
PokemonGo/RocketAPI/Window/PokeUi.Designer.cs
PokemonGo/RocketAPI/Window/PokeUi.cs
PokemonGo/RocketAPI/Window/PokeUi.resx
PokemonGo/RocketAPI/Window/PokemonGo.RocketAPI.Window.csproj
PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs
PokemonGo/RocketAPI/Window/SettingsForm.cs
PokemonGo/RocketAPI/Window/SettingsForm.resx
You may download the files in Public Git.