Skip to content

Commit

Permalink
Merge with beta 1.0.17
Browse files Browse the repository at this point in the history
  • Loading branch information
EricDavies committed Jul 4, 2016
1 parent 7ab8d6f commit c639daa
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions api/easyrtc.js
Original file line number Diff line number Diff line change
Expand Up @@ -1709,7 +1709,7 @@ try {
}
});
} catch (e) {}/** @class
*@version 1.0.17-beta
*@version 1.0.17
*<p>
* Provides client side support for the EasyRTC framework.
* Please see the easyrtc_client_api.md and easyrtc_client_tutorial.md
Expand Down Expand Up @@ -2055,7 +2055,7 @@ var Easyrtc = function() {
SIGNAL_ERR: "SIGNAL_ERR"
};

this.apiVersion = "1.0.17-beta";
this.apiVersion = "1.0.17";

/** Most basic message acknowledgment object */
this.ackMessage = {msgType: "ack"};
Expand Down
2 changes: 1 addition & 1 deletion api/easyrtc_ft.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/** @class
*@version 1.0.17-beta
*@version 1.0.17
*<p>
* Provides support file and data transfer support to easyrtc.
* </p>
Expand Down
4 changes: 2 additions & 2 deletions api/easyrtc_int.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/** @class
*@version 1.0.17-beta
*@version 1.0.17
*<p>
* Provides client side support for the EasyRTC framework.
* Please see the easyrtc_client_api.md and easyrtc_client_tutorial.md
Expand Down Expand Up @@ -345,7 +345,7 @@ var Easyrtc = function() {
SIGNAL_ERR: "SIGNAL_ERR"
};

this.apiVersion = "1.0.17-beta";
this.apiVersion = "1.0.17";

/** Most basic message acknowledgment object */
this.ackMessage = {msgType: "ack"};
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name" : "easyrtc",
"version" : "1.0.17-beta",
"version" : "1.0.17",
"homepage" : "http://www.easyrtc.com/",
"author" : "Priologic Software Inc. <[email protected]> (http://priologic.com/)",
"description" : "EasyRTC enables quick development of webRTC",
Expand Down

0 comments on commit c639daa

Please sign in to comment.