Index » Pokemon GO Bot : Commit ebad6d
Summary | Shortlog | Commit | Commitdiff | Tree |

Merge branch 'master' of https://github.com/DetectiveSquirrel/Pokemon-Go-Rocket-API

Author Edwin <edwin@yohanesedwin.com>
Author date 2016-07-25 18:49:52
Author local date 2016-07-26 01:49:52 +0700
Committer Edwin <edwin@yohanesedwin.com>
Committer date 2016-07-25 18:49:52
Committer local date 2016-07-26 01:49:52 +0700
Commit ebad6d705c7bfc9380e0f72dc0ee96dd3f67842d
Tree 84d38d0ef4733621c0a4fbeb3535e895a1f5cf69
Parent 9a0dffb00b3ac7890a50f31244c76f4e0a9bd509
Parent 16645ea8cc66a318660e55ee24bae77823c7de6c 
Merge branch 'master' of https://github.com/DetectiveSquirrel/Pokemon-Go-Rocket-API

Conflicts:
	PokemonGo/RocketAPI/PokemonGo.RocketAPI.csproj
	PokemonGo/RocketAPI/Window/MainForm.cs
	PokemonGo/RocketAPI/Window/PokemonForm.Designer.cs
	PokemonGo/RocketAPI/Window/PokemonForm.resx
	PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs
	PokemonGo/RocketAPI/Window/SettingsForm.cs
	PokemonGo/RocketAPI/Window/SettingsForm.resx
Affected files:
You may download the files in Public Git.