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

[Justin McPherson]

Add the webui resources to oxide.pak

[David Barth (dbarth)]

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

[Chris Coulson (chrisccoulson)]

review: Approve

[Chris Coulson (chrisccoulson)]

Thanks, I've merged this in to trunk

[Chris Coulson (chrisccoulson)]

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

=== modified file 'shared/shared.gyp'
--- shared/shared.gyp	2015-01-23 11:37:57 +0000
+++ shared/shared.gyp	2015-02-10 01:16:16 +0000
@@ -81,6 +81,7 @@
             'pak_inputs': [
               '<(SHARED_INTERMEDIATE_DIR)/blink/devtools_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/oxide/oxide_resources.pak',