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

map-editor Makefile.win #1

Merged
merged 1 commit into from
Oct 12, 2011
Merged

map-editor Makefile.win #1

merged 1 commit into from
Oct 12, 2011

Conversation

Sir-Odie
Copy link
Collaborator

first try of a pull request as suggested by bluap in forum

@ghost ghost assigned pjbroad Oct 12, 2011
pjbroad added a commit that referenced this pull request Oct 12, 2011
map-editor Makefile.win: Looks like I can do an automatic merge.
@pjbroad pjbroad merged commit a87b53b into raduprv:master Oct 12, 2011
gregoryfenton referenced this pull request in gregoryfenton/other-life Oct 1, 2012
pjbroad referenced this pull request in pjbroad/other-life Jan 26, 2013
Merged with latest EL client code
Sir-Odie referenced this pull request Sep 17, 2015
* Fix use after free. In this case, the use is not dangerous, as the freed
pointer is not dereferenced. Still, let's do the function call with this
pointer before it's freed.
* Remove dead assignment
* Actually warn for unknown frame node names in the actor scripts XML. A
misplaced continue statement made us skip the warning.
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