Oxide

Merge lp:~justinmcp/oxide/add-webui-resources into lp:~oxide-developers/oxide/oxide.trunk

  1. add-webui-resources
  2. Merge into oxide.trunk
Proposed by Justin McPherson
Status: Merged
Merged at revision: 974
Proposed branch: lp:~justinmcp/oxide/add-webui-resources
Merge into: lp:~oxide-developers/oxide/oxide.trunk
Diff against target: 11 lines (+1/-0)
1 file modified
shared/shared.gyp (+1/-0)
To merge this branch: bzr merge lp:~justinmcp/oxide/add-webui-resources
Reviewer Review Type Date Requested Status
Chris Coulson Approve
Review via email: mp+249139@code.launchpad.net

Commit message

Add the webui resources to oxide.pak

To post a comment you must log in.
Revision history for this message
David Barth (dbarth) wrote :

This looks like a good change to me, with a low regression potential.

Revision history for this message
Chris Coulson (chrisccoulson) :
review: Approve
Revision history for this message
Chris Coulson (chrisccoulson) wrote :

Thanks, I've merged this in to trunk

Revision history for this message
Chris Coulson (chrisccoulson) wrote :

Note, this required an extra change to avoid a crash in debug builds (http://bazaar.launchpad.net/~oxide-developers/oxide/oxide.trunk/revision/983)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'shared/shared.gyp'
2--- shared/shared.gyp 2015-01-23 11:37:57 +0000
3+++ shared/shared.gyp 2015-02-10 01:16:16 +0000
4@@ -81,6 +81,7 @@
5 'pak_inputs': [
6 '<(SHARED_INTERMEDIATE_DIR)/blink/devtools_resources.pak',
7 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
8+ '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
9 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
10 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
11 '<(SHARED_INTERMEDIATE_DIR)/oxide/oxide_resources.pak',

Subscribers

People subscribed via source and target branches