Reviewers: Jasvir,

Description:
All changes since the previous merge except for r5674 which is an
es53 removal cleanup.

The merge command was
svn merge -c 5671,5672,5673,5675,5676,5677 ^/trunk
and there was one conflict, which was just whitespace.

Please review this at https://codereview.appspot.com/85520044/

Affected files (+363, -174 lines):
   M    .
  M     src/com/google/caja/lang/html/html4-attributes-defs.json
  M     src/com/google/caja/lang/html/html4-attributes-whitelist.json
  M     src/com/google/caja/lang/html/html5-attributes-defs.json
  M     src/com/google/caja/lang/html/html5-attributes-whitelist.json
  M     src/com/google/caja/plugin/domado.js
  M     src/com/google/caja/plugin/html-emitter.js
  M     src/com/google/caja/ses/compileExprLater.js
  M     src/com/google/caja/ses/debug.js
  M     src/com/google/caja/ses/explicit.html
  M     src/com/google/caja/ses/makeSimpleAMDLoader.js
  M     src/com/google/caja/ses/repair-framework.js
  M     src/com/google/caja/ses/startSES.js
  M     src/com/google/caja/ses/useHTMLLogger.js
  MM    tests/com/google/caja/plugin/test-domado-dom-guest.html


--

--- You received this message because you are subscribed to the Google Groups "Google Caja Discuss" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to