Merge branch 'dont-clean-phony' of git://github.com/pcc/ninja
authorEvan Martin <martine@danga.com>
Thu, 26 Apr 2012 03:13:10 +0000 (20:13 -0700)
committerEvan Martin <martine@danga.com>
Thu, 26 Apr 2012 03:13:10 +0000 (20:13 -0700)
commitc2098f931b6d93b6eae406598e2b46c175bd969f
treebd6611e7b056b9a217de0b67fb7a3f1bcea62527
parent5d6249fa8c3d6241f46701f43fd48db576714ae4
parent3353e5508614598ff18592bda55f68a6223911cf
Merge branch 'dont-clean-phony' of git://github.com/pcc/ninja

Conflicts:
src/clean.cc
src/clean.cc
src/clean_test.cc