Rémi Verschelde 3f3f5a5359 Merge remote-tracking branch 'origin/gles3' into gles3-on-master ... Various merge conflicts have been fixed manually and some mistakes might have been made - time will tell :)		2017-01-02 21:52:26 +01:00
..
editor_atlas.cpp	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
editor_atlas.h	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
editor_bitmask_import_plugin.cpp	Fix various warnings	2016-08-13 13:21:35 +02:00
editor_bitmask_import_plugin.h	Bitmask import plugin	2016-06-05 19:14:39 +01:00
editor_export_scene.cpp	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
editor_export_scene.h	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
editor_font_import_plugin.cpp	Merge remote-tracking branch 'origin/gles3' into gles3-on-master	2017-01-02 21:52:26 +01:00
editor_font_import_plugin.h	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
editor_import_collada.cpp	Merge remote-tracking branch 'origin/gles3' into gles3-on-master	2017-01-02 21:52:26 +01:00
editor_import_collada.h	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
editor_mesh_import_plugin.cpp	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
editor_mesh_import_plugin.h	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
editor_sample_import_plugin.cpp	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
editor_sample_import_plugin.h	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
editor_scene_import_plugin.cpp	Merge remote-tracking branch 'origin/gles3' into gles3-on-master	2017-01-02 21:52:26 +01:00
editor_scene_import_plugin.h	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
editor_scene_importer_fbxconv.cpp	Merge remote-tracking branch 'origin/gles3' into gles3-on-master	2017-01-02 21:52:26 +01:00
editor_scene_importer_fbxconv.h	Merge remote-tracking branch 'origin/gles3' into gles3-on-master	2017-01-02 21:52:26 +01:00
editor_texture_import_plugin.cpp	Merge remote-tracking branch 'origin/gles3' into gles3-on-master	2017-01-02 21:52:26 +01:00
editor_texture_import_plugin.h	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
editor_translation_import_plugin.cpp	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
editor_translation_import_plugin.h	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
SCsub	style: Fix PEP8 whitespace issues in Python files	2016-11-01 00:35:16 +01:00