Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
LivInTheLookingGlass committed Feb 22, 2017
2 parents 720f96e + e92a3f6 commit 1f6b9f0
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion c_src/base.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions docs/javascript/tutorial/browser.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion js_src/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -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('.');
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion py_src/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down

0 comments on commit 1f6b9f0

Please sign in to comment.