Merge remote-tracking branch 'origin/master' into topic/robin/dataseries

Conflicts:
	CMakeLists.txt
	cmake
This commit is contained in:
Robin Sommer 2012-04-17 16:37:37 -07:00
commit a7bc12066b
104 changed files with 1523 additions and 338 deletions

View file

@ -278,9 +278,3 @@ void WriterFrontend::DeleteVals(Value** vals)
delete [] vals;
}