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

..

detect.py

png: Allow building shared freetype with bundled libpng

2016-11-19 14:09:01 +01:00

godot_server.cpp

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_server.cpp

Merge remote-tracking branch 'origin/gles3' into gles3-on-master

2017-01-02 21:52:26 +01:00

os_server.h

Merge remote-tracking branch 'origin/gles3' into gles3-on-master

2017-01-02 21:52:26 +01:00

platform_config.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