summaryrefslogtreecommitdiffstats
path: root/base
Commit message (Expand)AuthorAgeFilesLines
* Merge Chromium at r11.0.696.0: Initial merge by gitKristian Monsen2011-06-29112-1728/+2772
* Merge Chromium at r11.0.672.0: Fix conflicts in shared_memory_posix.ccKristian Monsen2011-06-141-14/+4
* Merge Chromium at r11.0.672.0: Fix conflicts in logging.ccKristian Monsen2011-06-141-7/+3
* Merge Chromium.org at r11.0.672.0: Initial merge by git.Kristian Monsen2011-06-14155-3077/+8039
* File not used, matching upstream to avoid conflicts.Kristian Monsen2011-06-141-22/+2
* Add ScopedOpenSSL::release like scoped_refptr::releaseBrian Carlstrom2011-06-051-0/+6
* Merge Chromium at r10.0.634.0: Initial merge by git.Kristian Monsen2011-05-25188-2150/+1875
* Removing local changes that strip out vlogKristian Monsen2011-05-231-9/+2
* Merge Chromium at 10.0.621.0: Fix conflict in prcpucfg.hKristian Monsen2011-05-161-5/+1
* Merge Chromium at 10.0.621.0: Fix conflict in message_loop.ccKristian Monsen2011-05-161-5/+1
* Merge Chromium at 10.0.621.0: Fix conflict in logging.ccKristian Monsen2011-05-161-3/+2
* Merge Chromium at 10.0.621.0: Fix conflict in hash_tables.hKristian Monsen2011-05-161-4/+0
* Merge Chromium at 10.0.621.0: Initial merge by git.Kristian Monsen2011-05-16140-3001/+2393
* am 2934fcc7: Build dmg_fp as a separate libraryKristian Monsen2011-03-314-0/+44
|\
| * Build dmg_fp as a separate libraryKristian Monsen2011-03-314-0/+44
* | am dc2edc99: Removing nss dependecyKristian Monsen2011-03-316-1682/+0
|\ \ | |/
| * Removing nss dependecyKristian Monsen2011-03-316-1682/+0
* | am f62b871a: Remove more projects from external/chromium that are not neededBart Sears2011-03-314-3981/+0
|\ \ | |/
| * Remove more projects from external/chromium that are not neededBart Sears2011-03-304-3981/+0
* | am 47c0a16e: Removing projects that are not needed to compileKristian Monsen2011-03-3039-7542/+0
|\ \ | |/
| * Removing projects that are not needed to compileKristian Monsen2011-03-3039-7542/+0
* | Merge Chromium at 9.0.597.106Steve Block2011-02-185-0/+21
* | am 68a6b857: Merge Chromium at 9.0.597.55: Fix process_util_posix.ccBen Murdoch2011-01-111-0/+5
|\ \ | |/
| * Merge Chromium at 9.0.597.55: Fix process_util_posix.ccBen Murdoch2011-01-111-0/+5
* | am 78494470: Merge chromium at 9.0.597.55: Fix conflicts.Ben Murdoch2011-01-111-5/+1
|\ \ | |/
| * Merge chromium at 9.0.597.55: Fix conflicts.Ben Murdoch2011-01-111-5/+1
* | am 201ade2f: Merge chromium at 9.0.597.55: Initial merge by git.Ben Murdoch2011-01-1176-296/+1081
|\ \ | |/
| * Merge chromium at 9.0.597.55: Initial merge by git.Ben Murdoch2011-01-1176-296/+1081
* | Revert "Guard startup_data_ to ensure it is set."Patrick Scott2011-01-052-30/+0
|/
* Guard startup_data_ to ensure it is set.Patrick Scott2010-12-162-0/+30
* Merge Chromium at r66597: Initial merge by git.Ben Murdoch2010-12-0367-344/+1538
* Merge Chromium at r65505: Merge ANDROID edits into new debugging fileBen Murdoch2010-11-191-3/+18
* Merge Chromium at r65505: Fix conflicts.Ben Murdoch2010-11-192-8/+2
* Merge Chromium at r65505: Initial merge by git.Ben Murdoch2010-11-18149-1663/+3316
* Fix some Chromium compiler warningsSteve Block2010-11-081-1/+7
* Merge Chromium at r63472 : Fix shared_memory_posix.ccIain Merrick2010-11-031-0/+6
* Merge Chromium at r63472 : Fix string_number_conversions.ccIain Merrick2010-11-031-0/+10
* Merge Chromium at r63472 : Fix conflicts.Iain Merrick2010-11-031-24/+3
* Merge Chromium at r63472 : Initial merge by git.Iain Merrick2010-11-03189-4266/+4074
* Fix chromium code to use timegm64()Steve Block2010-11-022-10/+0
* Final fixing of ANDROID guardsKristian Monsen2010-10-272-3/+3
* Improving an old compile fixKristian Monsen2010-10-261-1/+1
* Syncing external/chroimum with chromium release 61029, base part 2Kristian Monsen2010-10-259-87/+55
* Syncing external/chromium with chromium release 61029, base part 1Kristian Monsen2010-10-2554-9163/+735
* Merge Chromium at 7.0.540.0 : Fix base/platform_file_posix.ccIain Merrick2010-10-191-0/+6
* Merge Chromium at 7.0.540.0 : Resolve conflicts.Iain Merrick2010-10-193-21/+12
* Merge Chromium at 7.0.540.0 : Initial merge by gitIain Merrick2010-10-19386-6073/+9626
* Build fixes for the simulator.Patrick Scott2010-10-013-6/+8
* Intial set of changes to enable autofill on Android.Ben Murdoch2010-09-132-0/+9
* Only defining LOG_ASSERT if is not already defined in ANDROID.Kristian Monsen2010-08-171-0/+8