Skip to content

Commit

Permalink
Merge branch 'refs/heads/development'
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Gorissen committed Jul 10, 2014
2 parents 63cb1cf + 88f9b50 commit 1a87c7d
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@

> Creating a common API for WebRTC in the browser
Find the most recent version hosted on our CDN. SSL versions are in the works.

- Minified version: `http://cdn.temasys.com.sg/adapterjs/latest/adapter.min.js`
- Debug version `http://cdn.temasys.com.sg/adapterjs/latest/adapter.debug.js`


## Compatibility

AdapterJS provides shims and cross-browser helpers for WebRTC. It wraps around the native APIs in Chrome, Opera and Firefox and provides support for WebRTC in Internet Explorer and Safari on Mac and Windows through the available [Temasys Browser Plugins](https://temasys.atlassian.net/wiki/display/TWPP/WebRTC+Plugins).
AdapterJS provides polyfills and cross-browser helpers for WebRTC. It wraps around the native APIs in Chrome, Opera and Firefox and provides support for WebRTC in Internet Explorer and Safari on Mac and Windows through the available [Temasys Browser Plugins](https://temasys.atlassian.net/wiki/display/TWPP/WebRTC+Plugins).


## Functionality
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
"url": "http://www.apache.org/licenses/LICENSE-2.0"
}],
"scripts": {
"test": "./test.sh;",
"prestart": "./start.sh;"
"test": "./test.sh;"
},
"dependencies": {},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion publish/adapter.debug.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! adapterjs - v0.0.3 - 2014-07-10 */
/*! adapterjs - v0.0.2 - 2014-07-10 */

RTCPeerConnection = null;
/**
Expand Down
2 changes: 1 addition & 1 deletion publish/adapter.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions start.sh

This file was deleted.

0 comments on commit 1a87c7d

Please sign in to comment.