Skip to content

Commit 7cd2be0

Browse files
author
Jeremy White
committed
Merge branch 'develop'
2 parents 1828a81 + 6b70bb8 commit 7cd2be0

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

AUTHORS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ Product Manager, Provider of Bubble Teas
66

77
Jason Lai -- [GitHub](https://github.com/jlai)
88

9-
webOS TV second screen APIs, Cordova plugin, Cordova sample apps, Android SDK, documentation
9+
webOS TV second screen APIs, Cordova plugin, Cordova sample apps, Android SDK, JS Bridge, documentation
1010

1111
---
1212

1313
Robert Yawn -- [GitHub](https://github.com/reyawn) | [Twitter](http://www.twitter.com/doctor_php)
1414

15-
webOS TV second screen APIs, webOS TV media player
15+
webOS TV second screen APIs, webOS TV media player, JS Bridge
1616

1717
---
1818

dist/connect_bridge.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
//
22
// Connect SDK JavaScript Bridge
3+
// Version 1.2.0 Date: 16 Apr 2014 10:29 PM
34
//
4-
// Created by Jeremy White on 12/2/13.
5+
// Created by Jeremy White on 4/16/14.
56
// Copyright (c) 2014 LG Electronics.
67
//
78
// Licensed under the Apache License, Version 2.0 (the "License");

dist/connect_bridge.min.js

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sample/scripts/connect_bridge.min.js

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tools/license_header.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
//
22
// Connect SDK JavaScript Bridge
3+
// Version 1.2.0 Date: 16 Apr 2014 10:29 PM
34
//
4-
// Created by Jeremy White on 12/2/13.
5+
// Created by Jeremy White on 4/16/14.
56
// Copyright (c) 2014 LG Electronics.
67
//
78
// Licensed under the Apache License, Version 2.0 (the "License");

0 commit comments

Comments
 (0)