Sam Gibson 257616da50 servo: Merge #8776 - Fix the parsing of the chromium HSTS preload list (from samfoo:hsts-preload-download-fix); r=jdm ... Urg! The Chromium HSTS preload JSON file contains single line comments. Previously these were filtered out with a very simple regex that just looked for '//' and removed the line. Now the file has added a couple fields that have URLs in them that were erroneously removed and caused the JSON parsing to fail. This commit slightly complicates the regex to fix this specific problem. If this happens again, it's likely worth it to figure out how to use a real parser to remove the comments. servo/servo#8760 Source-Repo: https://github.com/servo/servo Source-Revision: 2be60be062e14c937af601faed78a6aceccdb062		2015-12-02 09:56:05 +05:01
..
ahem	servo: Merge #7013 - Make the Ahem font available to test-css and test-wpt tests (from servo:user-stylesheets); r=mbrubeck	2015-08-07 14:05:19 -06:00
user-agent-js	servo: Merge #5298 - Basic userscript support (from Manishearth:userscript); r=saneyuki	2015-03-22 08:27:48 -06:00
ahem.css	servo: Merge #7013 - Make the Ahem font available to test-css and test-wpt tests (from servo:user-stylesheets); r=mbrubeck	2015-08-07 14:05:19 -06:00
android_params	servo: Merge #8254 - Read params from a file on Android (from connorimes:android-params-file); r=larsbergstrom	2015-10-31 04:18:22 +05:01
badcert.html	servo: Merge #4741 - Basic certificate verification (from Manishearth:cert-checking); r=jdm	2015-01-31 03:42:48 -07:00
badcert.jpg	servo: Merge #4741 - Basic certificate verification (from Manishearth:cert-checking); r=jdm	2015-01-31 03:42:48 -07:00
cert-google-only	servo: Merge #4741 - Basic certificate verification (from Manishearth:cert-checking); r=jdm	2015-01-31 03:42:48 -07:00
certs	servo: Merge #4741 - Basic certificate verification (from Manishearth:cert-checking); r=jdm	2015-01-31 03:42:48 -07:00
failure.html	servo: Merge #3601 - Read user-agent.css at run time. Fix #3516 (from SimonSapin:runtime-ua-stylesheet); r=jdm	2014-10-08 00:42:36 -06:00
hsts_preload.json	servo: Merge #8776 - Fix the parsing of the chromium HSTS preload list (from samfoo:hsts-preload-download-fix); r=jdm	2015-12-02 09:56:05 +05:01
iso-8859-8.css	servo: Merge #5729 - Don't link to specific WHATWG multipage page (from frewsxcv:whatwg-multipage-redirects); r=Manishearth	2015-04-17 08:57:33 -05:00
itried.jpg	servo: Merge #8649 - Moving Servo's cry message! (from Wafflespeanut:I_TRIED); r=SimonSapin	2015-11-23 02:52:57 +05:01
not-found.html	servo: Merge #8650 - Redirect to an error page on 404! (from Wafflespeanut:about-404); r=Wafflespeanut	2015-11-26 22:18:03 +05:01
prefs.json	servo: Merge #8578 - Change default homepage to servo.org (from jgraham:servo_homepage); r=larsbergstrom	2015-11-18 18:00:03 +05:01
presentational-hints.css	servo: Merge #7825 - Fully implement the "align descendants" rule for div (from eefriedman:div-align); r=mbrubeck	2015-10-08 12:20:55 -06:00
quirks-mode.css	servo: Merge #5980 - layout: Implement `<table width>` and `<center>` (from pcwalton:table-width-and-center); r=mbrubeck	2015-05-11 15:25:42 -05:00
quotes.css	servo: Merge #5729 - Don't link to specific WHATWG multipage page (from frewsxcv:whatwg-multipage-redirects); r=Manishearth	2015-04-17 08:57:33 -05:00
rippy.png	servo: Merge #8517 - Use the correct .png extension for the image placeholder (from rillian:rippy); r=larsbergstrom	2015-11-14 00:49:08 +05:01
servo.css	servo: Merge #8070 - Move inline-block styling to user-agent and add button (from badboy:inline-block-for-button); r=jdm	2015-10-25 12:43:00 -05:00
tumbeast.png	servo: Merge #8650 - Redirect to an error page on 404! (from Wafflespeanut:about-404); r=Wafflespeanut	2015-11-26 22:18:03 +05:01
user-agent.css	servo: Merge #8070 - Move inline-block styling to user-agent and add button (from badboy:inline-block-for-button); r=jdm	2015-10-25 12:43:00 -05:00