unity-js-scopes

Merge lp:~marcustomlinson/unity-js-scopes/lp-1506047 into lp:unity-js-scopes

  1. lp-1506047
  2. Merge into trunk
Proposed by Marcus Tomlinson
Status: Merged
Merged at revision: 116
Proposed branch: lp:~marcustomlinson/unity-js-scopes/lp-1506047
Merge into: lp:unity-js-scopes
Diff against target: 11 lines (+0/-1)
1 file modified
src/bindings/src/addon.cc (+0/-1)
To merge this branch: bzr merge lp:~marcustomlinson/unity-js-scopes/lp-1506047
Reviewer Review Type Date Requested Status
Alexandre Abreu (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+278136@code.launchpad.net

Commit message

Removed duplicate CategorisedResult binding causing a runtime error with debug builds

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:116
http://jenkins.qa.ubuntu.com/job/unity-js-scopes-ci/59/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-amd64-ci/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/60
        deb: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/60/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-i386-ci/59

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-js-scopes-ci/59/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alexandre Abreu (abreu-alexandre) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/bindings/src/addon.cc'
2--- src/bindings/src/addon.cc 2015-11-08 15:49:12 +0000
3+++ src/bindings/src/addon.cc 2015-11-20 12:12:01 +0000
4@@ -434,7 +434,6 @@
5 module.add_class("Category", category);
6 module.add_class("CategorisedResult", categorised_result);
7 module.add_class("CannedQuery", canned_query);
8- module.add_class("CategorisedResult", categorised_result);
9 module.add_class("CategoryRenderer", category_renderer);
10 module.add_class("ColumnLayout", column_layout);
11 module.add_class("Department", department);

Subscribers

People subscribed via source and target branches

to all changes: