Andrew Heather c909a5df25 GIT: resolved merge conflict		2018-06-13 14:20:18 +01:00
..
advanced	GIT: resolved merge conflict	2018-06-13 14:20:18 +01:00
conversion	STYLE: consistent use of '= delete' for removed constructors/assignments	2018-05-30 12:03:17 +02:00
doc	ENH: (further) Doxygen documentation updates for module support	2016-06-27 20:34:19 +01:00
generation	GIT: resolved merge conflict	2018-06-13 14:20:18 +01:00
manipulation	GIT: resolved merge conflict	2018-06-13 14:20:18 +01:00