Merge branch 'factor-elide-middle' of git://github.com/polrop/ninja
authorEvan Martin <martine@danga.com>
Wed, 1 Aug 2012 23:12:55 +0000 (16:12 -0700)
committerEvan Martin <martine@danga.com>
Wed, 1 Aug 2012 23:12:55 +0000 (16:12 -0700)
commitd82e806729bed17bf8fba738ed63eb740863c79e
tree5dd194c3aa466e5b0a597efd27e7fb478256c261
parent080314c22ff73fd9e6bc085e0e7053a09a3a6592
parent8b590881013a05fd5017aa94185a02f6b7d09758
Merge branch 'factor-elide-middle' of git://github.com/polrop/ninja

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