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
..
2d	Merge remote-tracking branch 'origin/gles3' into gles3-on-master	2017-01-02 21:52:26 +01:00
3d	Merge remote-tracking branch 'origin/gles3' into gles3-on-master	2017-01-02 21:52:26 +01:00
animation	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
audio	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
gui	Merge remote-tracking branch 'origin/gles3' into gles3-on-master	2017-01-02 21:52:26 +01:00
io	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
main	Merge remote-tracking branch 'origin/gles3' into gles3-on-master	2017-01-02 21:52:26 +01:00
resources	Merge remote-tracking branch 'origin/gles3' into gles3-on-master	2017-01-02 21:52:26 +01:00
register_scene_types.cpp	Merge remote-tracking branch 'origin/gles3' into gles3-on-master	2017-01-02 21:52:26 +01:00
register_scene_types.h	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
scene_string_names.cpp	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
scene_string_names.h	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
SCsub	style: Various other PEP8 fixes in Python files	2016-11-01 00:35:16 +01:00