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
..
SCsub	style: Fix PEP8 whitespace issues in Python files	2016-11-01 00:35:16 +01:00
canvas_layer.cpp	Merge remote-tracking branch 'origin/gles3' into gles3-on-master	2017-01-02 21:52:26 +01:00
canvas_layer.h	Merge remote-tracking branch 'origin/gles3' into gles3-on-master	2017-01-02 21:52:26 +01:00
http_request.cpp	Merge pull request #7271 from Faless/ipv6_cleanup	2017-01-02 15:51:45 +01:00
http_request.h	Merge pull request #7271 from Faless/ipv6_cleanup	2017-01-02 15:51:45 +01:00
instance_placeholder.cpp	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
instance_placeholder.h	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
node.cpp	Merge remote-tracking branch 'origin/gles3' into gles3-on-master	2017-01-02 21:52:26 +01:00
node.h	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
resource_preloader.cpp	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
resource_preloader.h	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
scene_main_loop.cpp	Merge remote-tracking branch 'origin/gles3' into gles3-on-master	2017-01-02 21:52:26 +01:00
scene_main_loop.h	Merge remote-tracking branch 'origin/gles3' into gles3-on-master	2017-01-02 21:52:26 +01:00
timer.cpp	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
timer.h	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
viewport.cpp	Merge remote-tracking branch 'origin/gles3' into gles3-on-master	2017-01-02 21:52:26 +01:00
viewport.h	Merge remote-tracking branch 'origin/gles3' into gles3-on-master	2017-01-02 21:52:26 +01:00