git.libre-soc.org Git - mesa.git/commit

projects / mesa.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9290e0d 26bbfb7)

author	Eric Anholt <eric@anholt.net>
	Thu, 24 Jun 2010 22:13:03 +0000 (15:13 -0700)
committer	Eric Anholt <eric@anholt.net>
	Thu, 24 Jun 2010 22:13:03 +0000 (15:13 -0700)
commit	e33c10328caec29616a5433b1d1df9088f3a84df
tree	723cc38803bb10032d28be9a9a161232d05d0fd1	tree
parent	9290e0dd28e646c3dc810e0a6405582f8bf643b6	commit \| diff
parent	26bbfb7917a71d46d9227bbf960606cb673636d3	commit \| diff

Merge remote branch 'cworth/master'

Conflicts:
ast_to_hir.cpp
ir.cpp

This brings in the talloc-based memory management work, so that the
compiler (almost) no longer leaks memory.

ast_to_hir.cpp	diff1 \|	diff2 \|	blob \| history
ir.cpp	diff1 \|	diff2 \|	blob \| history
ir_clone.cpp	diff1 \|	diff2 \|	blob \| history
ir_function_inlining.cpp	diff1 \|	diff2 \|	blob \| history