Merge lp://staging/~marcustomlinson/unity-js-scopes/standalone-scope into lp://staging/unity-js-scopes
Proposed by
Marcus Tomlinson
Status: | Merged |
---|---|
Merged at revision: | 74 |
Proposed branch: | lp://staging/~marcustomlinson/unity-js-scopes/standalone-scope |
Merge into: | lp://staging/unity-js-scopes |
Diff against target: |
245 lines (+109/-14) 11 files modified
debian/control (+3/-3) debian/unity-js-scopes-bindings.install (+1/-1) debian/unity-js-scopes-launcher.install (+2/-1) examples/simple-click/CMakeLists.txt (+12/-3) examples/simple-click/js-scope.apparmor (+1/-1) examples/simple-click/src/CMakeLists.txt (+16/-1) examples/simple-click/src/js-scope.webapps_js-scope.ini.in (+1/-3) src/CMakeLists.txt (+1/-0) src/launcher/main.cc (+2/-1) src/tool/CMakeLists.txt (+22/-0) src/tool/unity-js-scopes-tool (+48/-0) |
To merge this branch: | bzr merge lp://staging/~marcustomlinson/unity-js-scopes/standalone-scope |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexandre Abreu (community) | Approve | ||
Review via email: mp+270684@code.staging.launchpad.net |
Commit message
Added unity-js-
To post a comment you must log in.