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

modified config lines to specify platforms #308

Merged
merged 1 commit into from Jul 6, 2016
Merged

Conversation

@lanamorgan
Copy link
Contributor

lanamorgan commented Jul 5, 2016

the previous PR had a merge conflict in device.rs but this should work
r? @larsbergstrom

@metajack
Copy link

metajack commented Jul 6, 2016

Patch looks fine, but I'm curious why you only changed some of these? For example, in src/renderer.rs enable_msaa has the same cfg line but you didn't modify it. I found a few in the other file as well.

@lanamorgan
Copy link
Contributor Author

lanamorgan commented Jul 6, 2016

I'm sorry, grep isn't turning up anything in those files for me--can you give me a line no? I only changed lines that were targeting platforms that were defined as "neither gonk nor android" and I don't see any of those left in the patches I submitted. I left the cfg lines that were targeting gonk and android alone because that's what Glenn had done originally/that made sense.

@metajack
Copy link

metajack commented Jul 6, 2016

@bors-servo r+

Sorry, I misread those lines.

@bors-servo
Copy link
Contributor

bors-servo commented Jul 6, 2016

📌 Commit 9465b61 has been approved by metajack

@bors-servo
Copy link
Contributor

bors-servo commented Jul 6, 2016

Testing commit 9465b61 with merge 6e8a39c...

bors-servo added a commit that referenced this pull request Jul 6, 2016
modified config lines to specify platforms

the previous PR had a merge conflict in device.rs but this should work
r? @larsbergstrom
@bors-servo
Copy link
Contributor

bors-servo commented Jul 6, 2016

☀️ Test successful - travis

@bors-servo bors-servo merged commit 9465b61 into servo:master Jul 6, 2016
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
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

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