Merge branch 'master' into efficiency-improvements

Author Patrick Branch <branch.patrick@gmail.com>
Author date 2016-07-27 17:27:30
Author local date 2016-07-27 13:27:30 -0400
Committer Patrick Branch <branch.patrick@gmail.com>
Committer date 2016-07-27 17:27:30
Committer local date 2016-07-27 13:27:30 -0400
Commit a8c8c694fad8b6ec9df1738542a6e53ec2c4628a
Tree 204377d7e3b9f0cc2d164106e5456b41751cfe20
Parent 532d377fa69a256fc64fa3e6728bb044786336a6
Parent 37e3d92d9e87fe067f685e8106c528ced6bc1ed3
Merge branch 'master' into efficiency-improvements
Affected files:
PokemonGo/RocketAPI/Window/MainForm.cs
PokemonGo/RocketAPI/Window/PokemonGo.RocketAPI.Window.csproj
You may download the files in Public Git.