Merge Upstream.

This commit is contained in:
Matt C 2016-12-01 22:55:09 +00:00
commit ca8fef1c90
7 changed files with 57 additions and 11 deletions

View file

@ -1,18 +1,32 @@
202 source files
<<<<<<< HEAD
104240 lines
size
136 JavaScript source files
95168 lines
3.5M size
=======
104191 lines
4.0M size
136 JavaScript source files
95119 lines
3.4M size
>>>>>>> upstream/master
78 third party JavaScript source files
76377 lines
2.8M size
58 first party JavaScript source files
<<<<<<< HEAD
18791 lines
736K size
=======
18742 lines
724K size
>>>>>>> upstream/master
3.1M uncompressed JavaScript size
1.7M compressed JavaScript size