Merge branch 'develop'

LivInTheLookingGlass · LivInTheLookingGlass · commit 1f6b9f078ed5 · 2017-02-22T10:07:10.000-05:00
diff --git a/c_src/base.h b/c_src/base.h
@@ -10,7 +10,7 @@
 
 #define C2P_PROTOCOL_MAJOR_VERSION 0
 #define C2P_PROTOCOL_MINOR_VERSION 6
-#define C2P_NODE_VERSION 676
+#define C2P_NODE_VERSION 757
 #define C2P_VERSION CP2P__STR__(C2P_PROTOCOL_MAJOR_VERSION) "." CP2P__STR__(C2P_PROTOCOL_MINOR_VERSION) "." CP2P__STR__(C2P_NODE_VERSION)
 /**
 * .. c:macro:: C2P_PROTOCOL_MAJOR_VERSION
diff --git a/docs/javascript/tutorial/browser.rst b/docs/javascript/tutorial/browser.rst
@@ -8,9 +8,9 @@ Your page will look something like:
 .. code-block:: html
 
     <head>
-        <script type="text/javascript" src="./build/browser-min/js2p-browser-0.6.676-base.min.js"></script>
+        <script type="text/javascript" src="./build/browser-min/js2p-browser-0.6.757-base.min.js"></script>
         <!-- Other js2p loaders here -->
-        <script type="text/javascript" src="./build/browser-min/js2p-browser-0.6.676.min.js"></script>
+        <script type="text/javascript" src="./build/browser-min/js2p-browser-0.6.757.min.js"></script>
     </head>
 
 The two scripts shown are the only required. The library will automatically load any other provided components.
@@ -41,10 +41,10 @@ This example shows the simple construction of a :js:class:`js2p.sync.SyncSocket`
     <!doctype html>
     <html>
         <head>
-            <script type="text/javascript" src="./build/browser/js2p-browser-0.6.676-base.js"></script>
-            <script type="text/javascript" src="./build/browser/js2p-browser-0.6.676-mesh.js"></script>
-            <script type="text/javascript" src="./build/browser/js2p-browser-0.6.676-sync.js"></script>
-            <script type="text/javascript" src="./build/browser/js2p-browser-0.6.676.js"></script>
+            <script type="text/javascript" src="./build/browser/js2p-browser-0.6.757-base.js"></script>
+            <script type="text/javascript" src="./build/browser/js2p-browser-0.6.757-mesh.js"></script>
+            <script type="text/javascript" src="./build/browser/js2p-browser-0.6.757-sync.js"></script>
+            <script type="text/javascript" src="./build/browser/js2p-browser-0.6.757.js"></script>
         </head>
         <body>
             <script type="text/javascript">
diff --git a/js_src/base.js b/js_src/base.js
@@ -63,7 +63,7 @@ else {
 *     This is :js:data:`~js2p.base.version_info` joined in the format ``'a.b.c'``
 */
 
-base.version_info = [0, 6, 676];
+base.version_info = [0, 6, 757];
 base.node_policy_version = base.version_info[2].toString();
 base.protocol_version = base.version_info.slice(0, 2).join(".");
 base.version = base.version_info.join('.');
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "js2p",
   "main": "js_src/js2p.js",
-  "version": "0.6.676",
+  "version": "0.6.757",
   "license": "LGPL-3.0",
   "repository": {
     "type": "git",
diff --git a/py_src/base.py b/py_src/base.py
@@ -32,7 +32,7 @@
                     Dict[str, _MsgPackable]]
 
 protocol_version = "0.6"
-node_policy_version = "676"
+node_policy_version = "757"
 
 version = '.'.join((protocol_version, node_policy_version))
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "js2p",`
`3`	`3`	`"main": "js_src/js2p.js",`
`4`		`- "version": "0.6.676",`
	`4`	`+ "version": "0.6.757",`
`5`	`5`	`"license": "LGPL-3.0",`
`6`	`6`	`"repository": {`
`7`	`7`	`"type": "git",`