Merge branch 'master' of github.com:martine/ninja
authorEvan Martin <martine@danga.com>
Fri, 15 Apr 2011 19:26:45 +0000 (12:26 -0700)
committerEvan Martin <martine@danga.com>
Fri, 15 Apr 2011 19:26:45 +0000 (12:26 -0700)
commite5891f73fea0879851312fbaec8f32490fa4638c
tree73345c0ee79d2d92c0c2f718557d7785e8c00905
parentece2d63323bde9fd89956193167e09708802d73c
parent9d5fd61c00b34511fd16bce1a3233743c7e4448f
Merge branch 'master' of github.com:martine/ninja

Conflicts:
src/util.cc
src/util.h
src/util.cc
src/util.h