OSDN Git Service

resolved conflicts for merge of 90b35770 to eclair-mr2
authorDianne Hackborn <hackbod@google.com>
Thu, 19 Nov 2009 18:57:12 +0000 (10:57 -0800)
committerDianne Hackborn <hackbod@google.com>
Thu, 19 Nov 2009 18:57:12 +0000 (10:57 -0800)
commit07e1232a2dc2887ba0003d629032c21fbb426652
tree88abf5a75a35cf3357cd5173968cc976b3991298
parent1f816cf57b93654638989e6007d669c04b3d9b88
parent90b35770c227f9b4ad56194de627593496acf724
resolved conflicts for merge of 90b35770 to eclair-mr2
cleanspec.mk