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

Cats #949

Merged
merged 4 commits into from Mar 10, 2013
Merged

Cats #949

merged 4 commits into from Mar 10, 2013

Conversation

NimbusBP1729
Copy link
Member

... and monkeys in the forest levels

Addresses part of #763

Conflicts:
	src/maps/forest-2.tmx
	src/maps/forest.tmx
	src/maps/village-forest.tmx
jhoff pushed a commit that referenced this pull request Mar 10, 2013
@jhoff jhoff merged commit 30276e7 into hawkthorne:master Mar 10, 2013
@NimbusBP1729 NimbusBP1729 deleted the cat branch March 10, 2013 08:34
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.

None yet

2 participants