diff options
| author | Li-Ta Lo <ollie@lanl.gov> | 2006-04-19 15:11:01 +0000 |
|---|---|---|
| committer | Li-Ta Lo <ollie@lanl.gov> | 2006-04-19 15:11:01 +0000 |
| commit | 965b5ad85bf8f7ab144f81c232fd40e320c22545 (patch) | |
| tree | 2459f430b2c1570ef98ef79a9dc83b5ecbb9d99d /ChangeLog | |
| parent | 36c00aa39b9374fbf5f762fb9ebb022bce1f7fa0 (diff) | |
resolve conflict
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2260 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'ChangeLog')
0 files changed, 0 insertions, 0 deletions