Andrew Heather db5348880e MRG: resolved merge conflicts from merge from develop branch		2017-05-19 16:29:54 +01:00
..
advanced	ENH: relocate triSurface classes into surfMesh library (issue #294)	2017-05-18 10:42:05 +02:00
conversion	MRG: merged develop line back into integration branch	2017-05-18 11:11:12 +01:00
doc	ENH: (further) Doxygen documentation updates for module support	2016-06-27 20:34:19 +01:00
generation	MRG: resolved merge conflicts from merge from develop branch	2017-05-19 16:29:54 +01:00
manipulation	MRG: resolved merge conflicts from merge from develop branch	2017-05-19 16:29:54 +01:00