Index: trunk/src/ui/views/views.gyp |
=================================================================== |
--- trunk/src/ui/views/views.gyp (revision 212238) |
+++ trunk/src/ui/views/views.gyp (working copy) |
@@ -979,8 +979,8 @@ |
'../../base/base.gyp:base', |
'../../base/base.gyp:base_i18n', |
'../../chrome/chrome_resources.gyp:packed_resources', |
+ '../../content/content.gyp:content_shell_lib', |
'../../content/content.gyp:content', |
- '../../content/content.gyp:content_shell_lib', |
'../../content/content.gyp:test_support_content', |
'../../skia/skia.gyp:skia', |
'../../third_party/icu/icu.gyp:icui18n', |
Property changes on: trunk/src/ui/views/views.gyp |
___________________________________________________________________ |
Deleted: svn:mergeinfo |