summaryrefslogtreecommitdiffstats
path: root/chrome/common/extensions
Commit message (Collapse)AuthorAgeFilesLines
* Merge Chromium at 12.0.742.130: Initial merge by gitKristian Monsen2011-07-265-52/+353
| | | | | | Fix for bug 5080607 Update external/chromium to latest revision Change-Id: I5c98b0d2845fccca4cbcdcea506e8f1759ba5416
* Merge Chromium at r12.0.742.93: Initial merge by gitKristian Monsen2011-07-08143-1886/+13057
| | | | Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
* Merge Chromium at r11.0.696.0: Initial merge by gitKristian Monsen2011-06-29196-1591/+5678
| | | | Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d
* Merge Chromium.org at r11.0.672.0: Initial merge by git.Kristian Monsen2011-06-14128-2230/+21174
| | | | Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
* Merge Chromium at r10.0.634.0: Initial merge by git.Kristian Monsen2011-05-2579-210/+419
| | | | Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
* Merge Chromium at 10.0.621.0: Initial merge by git.Kristian Monsen2011-05-16111-345/+937
| | | | Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
* Merge Chromium at 9.0.597.106Steve Block2011-02-182-33/+109
| | | | | | This is branches/597 at r74919. Change-Id: Iab4795189c52e254b04051b05cbceda407afb0b6
* Merge Chromium at 9.0.597.83: Trivial merge by GitBen Murdoch2011-01-2513-24/+4
| | | | Change-Id: Ib650207b150b49b604e6fd25a20d7ed7a6de9afc
* Merge Chromium at 9.0.597.76: Trivial merge by GitBen Murdoch2011-01-205-79/+37
| | | | Change-Id: I3a36375821806209cd5c303c78225428396c5010
* Merge Chromium at 9.0.597.69: Trivial merge by Git.Ben Murdoch2011-01-1673-1073/+333
| | | | | | /branches/597/src@71538 Change-Id: Id9fad65a5e6d2ab901d9c8bff6dbf96ab7977f36
* Merge chromium at 9.0.597.55: Initial merge by git.Ben Murdoch2011-01-1194-1121/+4058
| | | | Change-Id: Id686a88437441ec7e17abb3328a404c7b6c3c6ad
* Merge Chromium at r66597: Fix strangeness in permission_warnings.htmlBen Murdoch2010-12-031-4/+0
| | | | | | Git seems to have got confused in the merge. Change-Id: Ifb10f7f0d5c248270b42f1ac969a44216de9a65b
* Merge Chromium at r66597: Initial merge by git.Ben Murdoch2010-12-03156-2565/+4459
| | | | Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
* Merge Chromium at r65505: Fix conflicts.Ben Murdoch2010-11-191-7/+0
| | | | | | | | | | | | | | | | | | | | | | | build/build_config.h: http://src.chromium.org/viewvc/chrome?view=rev&revision=63506 chrome/browser/autofill/personal_data_manager.h chrome/browser/autofill/personal_data_manager.cc: http://src.chromium.org/viewvc/chrome?view=rev&revision=65100 chrome/common/extensions/docs/permission_warnings.html: Git got confused :/ net/base/host_resolver_impl.cc: http://src.chromium.org/viewvc/chrome?view=rev&revision=64369 base/logging.cc: http://src.chromium.org/viewvc/chrome?view=rev&revision=65062 base/message_loop.cc: http://src.chromium.org/viewvc/chrome?view=rev&revision=64975 Change-Id: Ied0356824b26ad7e6fea14fdc56cebb73b8b2f2a
* Merge Chromium at r65505: Initial merge by git.Ben Murdoch2010-11-18126-1141/+4153
| | | | Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
* Merge Chromium at r63472 : Initial merge by git.Iain Merrick2010-11-03149-933/+4668
| | | | Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
* Adding missing files to chrome/commonKristian Monsen2010-10-27640-0/+140884
Again, not used but added to make merges easier Change-Id: If11539b063fdf39e8ca7e82d5c7b642d512e8f12
generated by cgit v1.1 at 2024-12-22 18:35:17 +0000