Merge branch 'master' into v2.x

Browse source

Conflicts:
	src/gl/shaders/gl_shader.cpp

...

This commit is contained in:

Christoph Oelckers 2014-08-03 18:16:15 +02:00

parent 370582d2fa 09a68e8c93

commit 00e4d4e2df

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available