Google Git
Sign in
chromium / chromium / src / a29777b64478fd43de19379003448491ca633894
commita29777b64478fd43de19379003448491ca633894[log] [tgz]
authorDaniel Cheng <dcheng@chromium.org>Tue Oct 11 01:16:23 2016
committerDaniel Cheng <dcheng@chromium.org>Tue Oct 11 01:23:17 2016
tree11af215a3e5358605cbd3a22d7e8fffc9d3ee858
parentd5d130905d1c817468474f0114bf99eea6914e45 [diff]
Remove merge rules for //third_party/WebKit from M55 branch.

Less magic for merges.

BUG=563793
R=thakis@chromium.org

Review URL: https://codereview.chromium.org/2404553002 .

Cr-Commit-Position: refs/branch-heads/2883@{#29}
Cr-Branched-From: 614d31daee2f61b0180df403a8ad43f20b9f6dd7-refs/heads/master@{#423768}
1 file changed
tree: 11af215a3e5358605cbd3a22d7e8fffc9d3ee858
  1. android_webview/
  2. apps/
  3. ash/
  4. base/
  5. blimp/
  6. blink/
  7. breakpad/
  8. build/
  9. build_overrides/
  10. cc/
  11. chrome/
  12. chrome_elf/
  13. chromecast/
  14. chromeos/
  15. components/
  16. content/
  17. courgette/
  18. crypto/
  19. dbus/
  20. device/
  21. docs/
  22. extensions/
  23. gin/
  24. google_apis/
  25. google_update/
  26. gpu/
  27. headless/
  28. infra/
  29. ios/
  30. ipc/
  31. jingle/
  32. mash/
  33. media/
  34. mojo/
  35. native_client_sdk/
  36. net/
  37. pdf/
  38. ppapi/
  39. printing/
  40. remoting/
  41. rlz/
  42. sandbox/
  43. sdch/
  44. services/
  45. skia/
  46. sql/
  47. storage/
  48. styleguide/
  49. testing/
  50. third_party/
  51. tools/
  52. ui/
  53. url/
  54. .clang-format
  55. .git-blame-ignore-revs
  56. .gitattributes
  57. .gitignore
  58. .gn
  59. AUTHORS
  60. BUILD.gn
  61. CODE_OF_CONDUCT.md
  62. codereview.settings
  63. DEPS
  64. LICENSE
  65. LICENSE.chromium_os
  66. OWNERS
  67. PRESUBMIT.py
  68. PRESUBMIT_test.py
  69. PRESUBMIT_test_mocks.py
  70. WATCHLISTS