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

Updated the style guide for #180 #181

Merged
merged 2 commits into from
Mar 12, 2015
Merged

Updated the style guide for #180 #181

merged 2 commits into from
Mar 12, 2015

Conversation

mwetter
Copy link
Contributor

@mwetter mwetter commented Mar 10, 2015

This integrates the changes from UdK Berlin.
The wiki has already been updated.

@mwetter
Copy link
Contributor Author

mwetter commented Mar 11, 2015

@mlauster : I resolved the conflicts, please review and merge to the master if you agree with the changes.

mlauster added a commit that referenced this pull request Mar 12, 2015
@mlauster mlauster merged commit 94d8548 into master Mar 12, 2015
@mlauster mlauster deleted the issue180_styleGuide branch March 12, 2015 15:23
@mlauster mlauster mentioned this pull request Mar 12, 2015
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