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

Merge branch 'master' of git.yohanesedwin.com:/home/git/publicgit/pogo-bot into personal

Author Edwin <edwin@yohanesedwin.com>
Author date 2016-07-28 00:27:46
Author local date 2016-07-28 07:27:46 +0700
Committer Edwin <edwin@yohanesedwin.com>
Committer date 2016-07-28 00:27:46
Committer local date 2016-07-28 07:27:46 +0700
Commit 2d9502006a568ab0889addaeb7f51881c4acec0e
Tree 0fb98c47375999b93d10a29461a727bb9630bef3
Parent 6b28e7c9c832cd7712e4fdf11bd07eb96e952cba
Parent 854fd9886db95312020abccff64611682afa9835 
Merge branch 'master' of git.yohanesedwin.com:/home/git/publicgit/pogo-bot into personal

Conflicts:
	.vs/Pokemon Go Rocket API/v14/.suo
	PokemonGo/RocketAPI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	PokemonGo/RocketAPI/obj/Debug/Pokemon Go Rocket API.dll
	PokemonGo/RocketAPI/obj/Debug/Pokemon Go Rocket API.pdb
	PokemonGo/RocketAPI/obj/Debug/PokemonGo.RocketAPI.csproj.FileListAbsolute.txt
	PokemonGo/RocketAPI/obj/Debug/PokemonGo.RocketAPI.csprojResolveAssemblyReference.cache
Affected files:
PokemonGo/RocketAPI/Window/MainForm.cs
PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs
You may download the files in Public Git.