summaryrefslogtreecommitdiff
path: root/remoting/remoting_webapp_files.gypi
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2014-04-16 11:17:03 +0100
committerBen Murdoch <benm@google.com>2014-04-16 11:17:03 +0100
commita02191e04bc25c4935f804f2c080ae28663d096d (patch)
tree3cf38961650b5734763e473336009287244306ac /remoting/remoting_webapp_files.gypi
parent8bad47e0f7d0c250a0443923cceb52f4a4abcd40 (diff)
downloadchromium_org-a02191e04bc25c4935f804f2c080ae28663d096d.tar.gz
Merge from Chromium at DEPS revision 263965
This commit was generated by merge_to_master.py. Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
Diffstat (limited to 'remoting/remoting_webapp_files.gypi')
-rw-r--r--remoting/remoting_webapp_files.gypi1
1 files changed, 1 insertions, 0 deletions
diff --git a/remoting/remoting_webapp_files.gypi b/remoting/remoting_webapp_files.gypi
index 1a74de7c42..c4bcc69f42 100644
--- a/remoting/remoting_webapp_files.gypi
+++ b/remoting/remoting_webapp_files.gypi
@@ -84,6 +84,7 @@
'webapp/menu_button.js',
'webapp/ui_mode.js',
'webapp/toolbar.js',
+ 'webapp/feedback.js',
],
# UI files for controlling the local machine as a host.
'remoting_webapp_js_ui_host_control_files': [