Merge branch 'master' of neugierig.org:projects/git/ninja
authorEvan Martin <martine@danga.com>
Mon, 20 Dec 2010 19:12:21 +0000 (11:12 -0800)
committerEvan Martin <martine@danga.com>
Mon, 20 Dec 2010 19:12:21 +0000 (11:12 -0800)
commitea24d6f36b452ca5f2c4ec2c75229c3792badd63
tree8117fe220a58dd0c2224a1b45e92737ca5aaa2e0
parent178f89cc435ffebb0faf7a1fa7923826aab9ce96
parent5c59ea2476688cabc8245c9a3624dc6ec4d8489c
Merge branch 'master' of neugierig.org:projects/git/ninja

Conflicts:
src/parsers.cc
src/parsers_test.cc