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

Port over to the latest incoming #36

Merged
merged 1 commit into from May 14, 2013
Merged

Conversation

@sstewartgallus
Copy link
Contributor

sstewartgallus commented May 14, 2013

No description provided.

@metajack
Copy link
Contributor

metajack commented May 14, 2013

Looks good, but it breaks on OS X. You need to remove the second extern { } block in cgl.rs. I'm not sure why it was duplicated, but removing the ll module makes it conflict now.

I'll merge it once you've removed that bit.

@sstewartgallus
Copy link
Contributor Author

sstewartgallus commented May 14, 2013

Removing the duplicated function is done.

metajack added a commit that referenced this pull request May 14, 2013
Port over to the latest incoming
@metajack metajack merged commit 7516c3c into servo:master May 14, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.