Skip to content

/ servo

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

Update Rust #821

Closed
wants to merge 8 commits into from
Closed

Update Rust #821

wants to merge 8 commits into from
+156 −75

Commits on Aug 29, 2013

  1. Update Rust

    @brson
    brson committed Aug 29, 2013
    1026556

  2. Merge remote-tracking branch 'origin/master' into HEAD 

    Conflicts:
	src/components/script/dom/bindings/proxyhandler.rs
	src/components/script/dom/bindings/text.rs
    @brson
    brson committed Aug 29, 2013
    9624148

  3. Rebase and update submodules

    @brson
    brson committed Aug 29, 2013
    449a252

Commits on Aug 30, 2013

  1. Remove incorrectly-added rust-http directory

    @brson
    brson committed Aug 30, 2013
    Loading status checks…
    12
    6d52445

  2. Touch rust-auto-clean-trigger

    @brson
    brson committed Aug 30, 2013
    d787033

  3. Merge remote-tracking branch 'origin/master' 

    Conflicts:
	src/components/script/dom/bindings/element.rs
	src/components/script/dom/bindings/node.rs
	src/components/script/dom/bindings/utils.rs
    @brson
    brson committed Aug 30, 2013
    Loading status checks…
    4
    4487b1c

  4. Merge remote-tracking branch 'origin/master'

    @brson
    brson committed Aug 30, 2013
    01cdfa3

  5. Update contenttest

    @brson
    brson committed Aug 30, 2013
    Loading status checks…
    5
    e2aa7b8
You can’t perform that action at this time.