3 commits

Author	SHA1	Message	Date
Michael DeHaan	de600f0040	Move integration tests into tests_new.	2014-02-20 19:10:38 -05:00
James Cammarata	d158ec382c	Adding new test for hash behavior (merge vs. replace)	2014-02-20 15:25:52 -05:00
Michael DeHaan	1b4ba5431b	Update makefile, add files for variable blending tests.	2014-02-20 13:25:19 -05:00