commit d64a2d9941c36a7bc2a7959ea10ab8363192ac14
author Adam Cozzette <acozzette@google.com> Wed Jun 29 15:23:27 2016 -0700
committer Adam Cozzette <acozzette@google.com> Wed Jun 29 15:38:03 2016 -0700
tree 52330d146ad63d3d70f3baade00d5d1fea8f5e0c
parent c18aa7795a2e02ef700ff8b039d94ecdcc33432f

Integrated internal changes from Google

This includes all internal changes from around May 20 to now.

js/binary/constants.js

diff --git a/js/binary/constants.js b/js/binary/constants.js
index 836216b..ef5fecd 100644
--- a/js/binary/constants.js
+++ b/js/binary/constants.js
@@ -141,8 +141,8 @@
 
 /**
  * A writer function serializes a message to a BinaryWriter.
- * @typedef {!function(!jspb.Message, !jspb.BinaryWriter):void |
- *           !function(!jspb.ConstBinaryMessage, !jspb.BinaryWriter):void}
+ * @typedef {function((!jspb.Message|!jspb.ConstBinaryMessage),
+ *                    !jspb.BinaryWriter):void}
  */
 jspb.WriterFunction;