Edgar Velazquez-Armendariz 50d596ece7 Merge with upstream		2013-01-26 23:12:34 -05:00
..
bidir	fixing 2-stage MLT, part 1	2012-10-23 10:47:46 -04:00
core	Merge with upstream	2013-01-26 23:12:34 -05:00
hw	support for render-time annotations	2013-01-04 13:07:25 -05:00
render	Merge with upstream	2013-01-26 23:12:34 -05:00
mitsuba.h	The epic 0.4.0 merge of the bidirectional branch -- sorry not to do this in smaller batches, but doing so would have been an incredible amount of work. A through description of the changes will be made available on the blog this week.	2012-09-27 12:43:51 -04:00