summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs
Commit message (Expand)AuthorAgeFilesLines
* Merge Chromium at r12.0.742.93: Compile fixes, add virtual destructorsKristian Monsen2011-07-081-0/+3
* Merge Chromium at r12.0.742.93: Initial merge by gitKristian Monsen2011-07-0837-255/+619
* Merge Chromium at r11.0.696.0: Initial merge by gitKristian Monsen2011-06-2922-193/+355
* Removing local changes from chrome/browser/prefsKristian Monsen2011-06-164-58/+1
* Merge Chromium at r11.0.672.0: Compile fixes in pref_service.ccKristian Monsen2011-06-141-1/+11
* Merge Chromium at r11.0.672.0: Fix conflicts in pref_value_store.ccKristian Monsen2011-06-141-23/+1
* Merge Chromium at r11.0.672.0: Fix conflicts in pref_service.ccKristian Monsen2011-06-141-37/+7
* Merge Chromium at r11.0.672.0: Fix conflicts in pref_service.hKristian Monsen2011-06-141-4/+1
* Merge Chromium.org at r11.0.672.0: Initial merge by git.Kristian Monsen2011-06-1436-867/+1818
* Merge Chromium at r10.0.634.0: Initial merge by git.Kristian Monsen2011-05-257-16/+34
* Merge changes I17af2234,I46f12b11,I53e91650,Ia924ea7c,Icd55c23eKristian Monsen2011-05-231-2/+0
|\
| * Remove #ifdef ANDROID for cherry-pickKristian Monsen2011-05-231-2/+0
* | Fix for bug 4466763: Browser crashes after performing some activityKristian Monsen2011-05-231-0/+4
|/
* Merge Chromium at 10.0.621.0: Fix conflicts in pref_service.*Kristian Monsen2011-05-202-55/+21
* Merge Chromium at 10.0.621.0: Fix conflicts in pref_value_store.*Kristian Monsen2011-05-202-220/+3
* Merge Chromium at 10.0.621.0: Fix conflict in pref_service.hKristian Monsen2011-05-201-10/+2
* Merge Chromium at 10.0.621.0: Initial merge by git.Kristian Monsen2011-05-1639-1742/+2105
* Merge Chromium at 9.0.597.69: Trivial merge by Git.Ben Murdoch2011-01-162-2/+3
* Merge chromium at 9.0.597.55: Fix conflicts.Ben Murdoch2011-01-111-6/+2
* Merge chromium at 9.0.597.55: Initial merge by git.Ben Murdoch2011-01-114-12/+40
* Merge Chromium at r66597: Fix conflicts.Ben Murdoch2010-12-032-55/+3
* Merge Chromium at r66597: Initial merge by git.Ben Murdoch2010-12-039-97/+351
* Merge Chromium at r65505: Initial merge by git.Ben Murdoch2010-11-187-97/+89
* Merge Chromium at r63472 : Fix pref_value_store.ccIain Merrick2010-11-031-0/+2
* Merge Chromium at r63472 : Fix conflicts.Iain Merrick2010-11-032-30/+3
* Merge Chromium at r63472 : Initial merge by git.Iain Merrick2010-11-0317-172/+547
* Implement l10n_util functions needed for AutoFill previews.Ben Murdoch2010-10-291-3/+0
* Merge Chromium at 7.0.540.0 : Fix chrome/browser/prefsIain Merrick2010-10-194-2/+51
* Merge Chromium at 7.0.540.0 : Initial merge by gitIain Merrick2010-10-1932-0/+4991