Simon Edwards fb70eb6813 Merge branch 'master' into python_type_hinting		2017-01-17 08:42:55 +01:00
..
__init__.py	T466: Revert the previous commit since it messed up the file rights.	2016-12-23 15:53:15 -05:00
ThreeMFReader.py	Merge branch 'master' into python_type_hinting	2017-01-17 08:42:55 +01:00
ThreeMFWorkspaceReader.py	Changed order of buttons	2016-12-16 11:35:08 +01:00
WorkspaceDialog.py	Applied the profiler's pyqtSlot decorator to all of the code.	2017-01-10 13:35:39 +01:00
WorkspaceDialog.qml	Moved conflict boxes to be aligned with "headers"	2016-12-19 13:04:55 +01:00