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

Merge master and master-upgrade branch #2

Merged
merged 2 commits into from Jun 26, 2013
Merged

Merge master and master-upgrade branch #2

merged 2 commits into from Jun 26, 2013

Conversation

@brson
Copy link
Contributor

brson commented Jun 26, 2013

This just merges the two heads that we ended up with after the recent rust upgrade. Doesn't seem to affect the build.

@metajack

This comment has been minimized.

Copy link

metajack commented on 68875af Jun 26, 2013

r+

metajack added a commit that referenced this pull request Jun 26, 2013
Merge master and master-upgrade branch
@metajack metajack merged commit 502ec15 into servo:master Jun 26, 2013
caitp pushed a commit to caitp/servo that referenced this pull request Apr 27, 2014
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.