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
..
export	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
context_gl_x11.cpp	Merge remote-tracking branch 'origin/gles3' into gles3-on-master	2017-01-02 21:52:26 +01:00
context_gl_x11.h	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
detect.py	Merge remote-tracking branch 'origin/gles3' into gles3-on-master	2017-01-02 21:52:26 +01:00
godot_x11.cpp	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
joystick_linux.cpp	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
joystick_linux.h	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
key_mapping_x11.cpp	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
key_mapping_x11.h	Welcome in 2017, dear changelog reader!	2017-01-01 22:03:33 +01:00
logo.png	Fixed iCCp chunk in pngs	2016-06-22 21:13:29 +02:00
os_x11.cpp	Merge remote-tracking branch 'origin/gles3' into gles3-on-master	2017-01-02 21:52:26 +01:00
os_x11.h	Merge remote-tracking branch 'origin/gles3' into gles3-on-master	2017-01-02 21:52:26 +01:00
platform_config.h	Merge remote-tracking branch 'origin/gles3' into gles3-on-master	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