review.tizen.org Git - platform/upstream/ninja.git/commit

projects / platform / upstream / ninja.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f7a22e3 28c5339)

author	Evan Martin <martine@danga.com>
	Fri, 27 Jul 2012 18:44:06 +0000 (11:44 -0700)
committer	Evan Martin <martine@danga.com>
	Fri, 27 Jul 2012 18:44:06 +0000 (11:44 -0700)
commit	9dd3f0dfdf42cc9eefc10664d747044f50a0ffd8
tree	45479fe2fd7b29023dc375c1fe6db0bdacd3265f	tree \| snapshot
parent	f7a22e3bc97fdeb87d930b7734680c481c6010bf	commit \| diff
parent	28c53397ed6876363a93e5a0ac3cd54ed66b662f	commit \| diff

Merge branch 'set_terminate' of git://github.com/gmoudry/ninja into minidump

(This likely doesn't compile, just getting all the history in place.)

Conflicts:
src/util.cc

src/ninja.cc	diff1 \|	diff2 \|	blob \| history
src/util.cc	diff1 \|	diff2 \|	blob \| history
src/util.h	diff1 \|	diff2 \|	blob \| history

Domain: System / Base;