Andrew Heather c909a5df25 GIT: resolved merge conflict		2018-06-13 14:20:18 +01:00
..
dataConversion	STYLE: consistent use of '= delete' for removed constructors/assignments	2018-05-30 12:03:17 +02:00
graphics	STYLE: consistent use of '= delete' for removed constructors/assignments	2018-05-30 12:03:17 +02:00
lagrangian	ENH: remove reliance on the Xfer class (issue #639)	2018-03-05 13:28:53 +01:00
lumped	STYLE: use 'return nullptr' for empty autoPtr/tmp returns	2018-03-21 09:31:09 +01:00
miscellaneous	STYLE: consistent use of '= delete' for removed constructors/assignments	2018-05-30 12:03:17 +02:00
noise	Merge branch 'master' into develop	2018-06-13 14:17:47 +01:00
postProcess	ENH: postProcess: Clear dictionary to avoid merge warning. See #807.	2018-06-06 09:07:32 +01:00