Merge branch 'texture-factorization' of https://github.com/supertuxkart/stk-code into texture-factorization

Browse Source

Conflicts:
	src/graphics/post_processing.cpp

...

This commit is contained in:

Marianne Gagnon

2014-08-19 19:45:24 -04:00

parent 5788073b17 ef95f5703a

commit ffd558e577

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

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available