Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ivan newbranch #5

Merged
merged 13 commits into from
Sep 29, 2015
Merged

Ivan newbranch #5

merged 13 commits into from
Sep 29, 2015

Conversation

rextor92
Copy link
Collaborator

No description provided.

IvanYanchev and others added 13 commits September 29, 2015 15:43
InitializeGame update
Added bonus collectibles; InitializeGame update
Conflicts:
	.vs/[AC]GroupProject/v14/.suo
	CarRacer/obj/Debug/CarRacer.csproj.FileListAbsolute.txt
Conflicts:
	.vs/[AC]GroupProject/v14/.suo
	CarRacer/Game.cs
	CarRacer/bin/Debug/CarRacer.exe
	CarRacer/bin/Debug/CarRacer.pdb
	CarRacer/obj/Debug/CarRacer.csproj.FileListAbsolute.txt
	CarRacer/obj/Debug/CarRacer.exe
	CarRacer/obj/Debug/CarRacer.pdb
	CarRacer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
IvanYanchev added a commit that referenced this pull request Sep 29, 2015
@IvanYanchev IvanYanchev merged commit e4243c9 into master Sep 29, 2015
@rextor92 rextor92 deleted the ivan_newbranch branch September 29, 2015 19:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants