| Index: trunk/src/chromeos/chromeos.gyp
|
| ===================================================================
|
| --- trunk/src/chromeos/chromeos.gyp (revision 190642)
|
| +++ trunk/src/chromeos/chromeos.gyp (working copy)
|
| @@ -22,7 +22,6 @@
|
| '../dbus/dbus.gyp:dbus',
|
| '../net/net.gyp:net',
|
| '../third_party/libxml/libxml.gyp:libxml',
|
| - 'ime/input_method.gyp:gencode',
|
| 'power_manager_proto',
|
| 'power_supply_properties_proto',
|
| 'video_activity_update_proto',
|
| @@ -166,8 +165,6 @@
|
| 'ime/input_method_descriptor.h',
|
| 'ime/input_method_property.cc',
|
| 'ime/input_method_property.h',
|
| - 'ime/input_method_whitelist.cc',
|
| - 'ime/input_method_whitelist.h',
|
| 'network/cros_network_functions.cc',
|
| 'network/cros_network_functions.h',
|
| 'network/device_state.cc',
|
| @@ -409,7 +406,6 @@
|
| 'disks/disk_mount_manager_unittest.cc',
|
| 'ime/input_method_descriptor_unittest.cc',
|
| 'ime/input_method_property_unittest.cc',
|
| - 'ime/input_method_whitelist_unittest.cc',
|
| 'network/cros_network_functions_unittest.cc',
|
| 'network/geolocation_handler_unittest.cc',
|
| 'network/network_change_notifier_chromeos_unittest.cc',
|
|
|
| Property changes on: trunk/src/chromeos/chromeos.gyp
|
| ___________________________________________________________________
|
| Deleted: svn:mergeinfo
|
|
|
|
|