| Index: content/content_common.gypi
|
| ===================================================================
|
| --- content/content_common.gypi (revision 152430)
|
| +++ content/content_common.gypi (working copy)
|
| @@ -10,7 +10,6 @@
|
| '../gpu/gpu.gyp:gpu_ipc',
|
| '../ipc/ipc.gyp:ipc',
|
| '../media/media.gyp:media',
|
| - '../media/media.gyp:shared_memory_support',
|
| '../net/net.gyp:net',
|
| '../ppapi/ppapi_internal.gyp:ppapi_shared',
|
| '../skia/skia.gyp:skia',
|
|
|
| Property changes on: content/content_common.gypi
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|