From c9d0258a7603d2a4c4da13bf78f839fda4a2bc38 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Thu, 11 Apr 2013 14:24:32 -0700 Subject: [PATCH] Update rust-opengles, rust-stb-image --- src/etc/licenseck.py | 1 + src/etc/tidy.py | 2 -- src/rust-opengles | 2 +- src/rust-stb-image | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/etc/licenseck.py b/src/etc/licenseck.py index efaf820698c..017fb3f24bd 100644 --- a/src/etc/licenseck.py +++ b/src/etc/licenseck.py @@ -59,6 +59,7 @@ exceptions = [ "rust-http-client/http_parser.c", # BSD, Joyent "rust-http-client/http_parser.h", # BSD, Joyent "rust-opengles/gl2.h", # SGI Free Software B License Version 2.0, Khronos Group + "rust-stb-image/stb_image.c", # Public domain "servo/dom/bindings/codegen/ply/ply/yacc.py", # BSD "servo/dom/bindings/codegen/ply/ply/__init__.py", # BSD "servo/dom/bindings/codegen/ply/ply/lex.py", # BSD diff --git a/src/etc/tidy.py b/src/etc/tidy.py index 07506da51b1..023c7380c9d 100644 --- a/src/etc/tidy.py +++ b/src/etc/tidy.py @@ -45,8 +45,6 @@ exceptions = [ "src/rust-harfbuzz/harfbuzz", # Upstream "src/skia", # Upstream "src/servo/dom/bindings/codegen", # Generated and upstream code combined with our own. Could use cleanup - "src/rust-opengles", # Need to contact copyright holders - "src/rust-stb-image", # " ] def should_check(name): diff --git a/src/rust-opengles b/src/rust-opengles index 942eac05bfd..fc84ce28dd7 160000 --- a/src/rust-opengles +++ b/src/rust-opengles @@ -1 +1 @@ -Subproject commit 942eac05bfd7397da0c8f9f92280bea4cf6021c4 +Subproject commit fc84ce28dd7a6f8fa64673efdff0ae8ced111920 diff --git a/src/rust-stb-image b/src/rust-stb-image index fd38ef064bb..425d31cd4e8 160000 --- a/src/rust-stb-image +++ b/src/rust-stb-image @@ -1 +1 @@ -Subproject commit fd38ef064bbac1444079a5262922c7bb73311216 +Subproject commit 425d31cd4e8a11af03032e07c6bbb18a20ea8661