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

Already on GitHub? Sign in to your account

Allow running UH with current FIFE git master #2058

Merged
merged 1 commit into from Apr 15, 2013

Conversation

Projects
None yet
2 participants
Member

ChrisOelmueller commented Mar 30, 2013

This manually merges the fifechan-sync branch and the compat layer
should be removed once we decide to stop supporting FIFE 0.3.4.

Member

ChrisOelmueller commented Mar 30, 2013

Removed another import block in 11ad92e

@ChrisOelmueller ChrisOelmueller Allow running UH with current FIFE git master
This manually merges the `fifechan-sync` branch and the compat layer
should be removed once we decide to stop supporting FIFE 0.3.4.
d50ef29

@nihathrael nihathrael added a commit that referenced this pull request Apr 15, 2013

@nihathrael nihathrael Merge pull request #2058 from unknown-horizons/035
Allow running UH with current FIFE git master
310697e

@nihathrael nihathrael merged commit 310697e into master Apr 15, 2013

@nihathrael nihathrael deleted the 035 branch Apr 15, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment