OSDN Git Service

resolved conflicts for merge of 636458dd to eclair-mr2
authorJean-Baptiste Queru <jbq@google.com>
Tue, 24 Nov 2009 22:58:54 +0000 (14:58 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 24 Nov 2009 22:58:54 +0000 (14:58 -0800)
commit69ed23d097f8d72aecb36b1b75e89ac101c4691a
tree1671fc812a03ec5516a15bc5d91a4e544d097b1d
parent7e39fc235185abd445f43674431b5796d3965bdd
parent636458dd0665f4cca1a208f054a891a97d3fa8de
resolved conflicts for merge of 636458dd to eclair-mr2
cleanspec.mk