summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/options
Commit message (Collapse)AuthorAgeFilesLines
* Merge Chromium.org at r11.0.672.0: Initial merge by git.Kristian Monsen2011-06-1443-10211/+0
| | | | Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
* Merge Chromium at r10.0.634.0: Initial merge by git.Kristian Monsen2011-05-257-35/+53
| | | | Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
* Merge Chromium at 10.0.621.0: Initial merge by git.Kristian Monsen2011-05-1632-122/+96
| | | | Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
* Merge chromium at 9.0.597.55: Initial merge by git.Ben Murdoch2011-01-114-114/+11
| | | | Change-Id: Id686a88437441ec7e17abb3328a404c7b6c3c6ad
* Merge Chromium at r66597: Initial merge by git.Ben Murdoch2010-12-038-92/+210
| | | | Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
* Merge Chromium at r65505: Initial merge by git.Ben Murdoch2010-11-1815-28/+125
| | | | Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
* Merge Chromium at r63472 : Initial merge by git.Iain Merrick2010-11-039-67/+42
| | | | Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
* Merge Chromium at 7.0.540.0 : Initial merge by gitIain Merrick2010-10-1938-289/+640
| | | | | | Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used. Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
* Merge Chromium src@r53293Ben Murdoch2010-08-0443-0/+9781
Change-Id: Ia79acf8670f385cee48c45b0a75371d8e950af34