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

..

config.py

style: Fix PEP8 blank lines issues in Python files

2016-11-01 00:35:16 +01:00

image_compress_squish.cpp

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

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

image_compress_squish.h

Welcome in 2017, dear changelog reader!

2017-01-01 22:03:33 +01:00

register_types.cpp

Welcome in 2017, dear changelog reader!

2017-01-01 22:03:33 +01:00

register_types.h

Welcome in 2017, dear changelog reader!

2017-01-01 22:03:33 +01:00

SCsub

scons: Reorder options for clarity

2016-11-03 07:45:08 +01:00