| commit | 1179efbb3b8856eb8160e2dd67a300a5d64e8e98 | [log] [tgz] |
|---|---|---|
| author | Jack Palevich <jackpal@google.com> | Wed Nov 11 10:01:46 2009 +0800 |
| committer | Jack Palevich <jackpal@google.com> | Wed Nov 11 10:01:46 2009 +0800 |
| tree | 52c7fcf280eb76e4171e833e5084ae1d9437ab24 | |
| parent | 6780d8c006c9381919c0ee4de3d2bdc6d7a728d6 [diff] | |
| parent | ba56915a71cad672baff5594dbb7c9331bf01283 [diff] |
resolved conflicts for merge of ba56915a to eclair-mr2