| Index: webkit/webkit.gyp
|
| ===================================================================
|
| --- webkit/webkit.gyp (revision 28107)
|
| +++ webkit/webkit.gyp (working copy)
|
| @@ -749,6 +749,9 @@
|
| 'target_name': 'devtools_html',
|
| 'type': 'none',
|
| 'msvs_guid': '9BE5D4D5-E800-44F9-B6C0-27DF15A9D817',
|
| + 'sources': [
|
| + '<(PRODUCT_DIR)/resources/inspector/devtools.html',
|
| + ],
|
| 'actions': [
|
| {
|
| 'action_name': 'devtools_html',
|
|
|
| Property changes on: webkit\webkit.gyp
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/src/webkit/webkit.gyp:r3734-4217,4606-5108,5177-5263
|
| Merged /trunk/src/webkit/webkit.gyp:r28102
|
|
|
|
|