| Index: trunk/src/ppapi/ppapi_internal.gyp
|
| ===================================================================
|
| --- trunk/src/ppapi/ppapi_internal.gyp (revision 193982)
|
| +++ trunk/src/ppapi/ppapi_internal.gyp (working copy)
|
| @@ -46,13 +46,13 @@
|
| '../base/base.gyp:base',
|
| '../base/base.gyp:base_i18n',
|
| '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
|
| + '../build/temp_gyp/googleurl.gyp:googleurl',
|
| '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
|
| '../gpu/gpu.gyp:command_buffer_client',
|
| '../gpu/gpu.gyp:gles2_implementation',
|
| '../media/media.gyp:shared_memory_support',
|
| '../skia/skia.gyp:skia',
|
| '../third_party/icu/icu.gyp:icuuc',
|
| - '../url/url.gyp:url',
|
| # TODO(ananta) : The WebKit dependency needs to move to a new target for NACL.
|
| '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
|
| '../ui/surface/surface.gyp:surface',
|
|
|
| Property changes on: trunk\src\ppapi\ppapi_internal.gyp
|
| ___________________________________________________________________
|
| Deleted: svn:mergeinfo
|
|
|
|
|