| Index: chrome/common/common_resources.grd
|
| ===================================================================
|
| --- chrome/common/common_resources.grd (revision 128135)
|
| +++ chrome/common/common_resources.grd (working copy)
|
| @@ -36,7 +36,6 @@
|
| <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_VIRTUALKEYBOARD" file="extensions\api\experimental.input.virtualKeyboard.json" type="BINDATA" />
|
| <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_KEYBINDING" file="extensions\api\experimental.keybinding.json" type="BINDATA" />
|
| <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_MANAGED_MODE" file="extensions\api\experimental.managedMode.json" type="BINDATA" />
|
| - <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_MEDIAGALLERIES" file="extensions\api\experimental.mediaGalleries.json" type="BINDATA" />
|
| <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_OFFSCREENTABS" file="extensions\api\experimental.offscreenTabs.json" type="BINDATA" />
|
| <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_PROCESSES" file="extensions\api\experimental.processes.json" type="BINDATA" />
|
| <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_RLZ" file="extensions\api\experimental.rlz.json" type="BINDATA" />
|
|
|
| Property changes on: chrome/common/common_resources.grd
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|