|
|
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.
@r5678
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+363 lines, -174 lines) |
Patch |
 |
M |
.
|
View
|
|
0 chunks |
+0 lines, -0 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/lang/html/html4-attributes-defs.json
|
View
|
|
1 chunk |
+3 lines, -14 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/lang/html/html4-attributes-whitelist.json
|
View
|
|
1 chunk |
+1 line, -6 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/lang/html/html5-attributes-defs.json
|
View
|
|
1 chunk |
+1 line, -2 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/lang/html/html5-attributes-whitelist.json
|
View
|
|
2 chunks |
+1 line, -4 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/plugin/domado.js
|
View
|
|
1 chunk |
+2 lines, -1 line |
0 comments
|
Download
|
 |
M |
src/com/google/caja/plugin/html-emitter.js
|
View
|
|
2 chunks |
+10 lines, -5 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/ses/compileExprLater.js
|
View
|
|
4 chunks |
+28 lines, -43 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/ses/debug.js
|
View
|
|
3 chunks |
+121 lines, -30 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/ses/explicit.html
|
View
|
|
4 chunks |
+61 lines, -30 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/ses/makeSimpleAMDLoader.js
|
View
|
|
1 chunk |
+4 lines, -1 line |
0 comments
|
Download
|
 |
M |
src/com/google/caja/ses/repair-framework.js
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
src/com/google/caja/ses/startSES.js
|
View
|
|
9 chunks |
+68 lines, -17 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/ses/useHTMLLogger.js
|
View
|
|
2 chunks |
+53 lines, -16 lines |
0 comments
|
Download
|
 |
MM |
tests/com/google/caja/plugin/test-domado-dom-guest.html
|
View
|
|
3 chunks |
+9 lines, -4 lines |
0 comments
|
Download
|
Total messages: 2
|