Merge branch 'master' into NDK-ShadowMapping

Browse Source

Former-commit-id: 83435ab51753299b30a102871fbcd5558d2ac4f1

...

This commit is contained in:

Lynix

2015-12-09 00:59:07 +01:00

parent 1ffd2b724f ee2257810c

commit 9cf5e4b68c

751 changed files with 79400 additions and 71735 deletions

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

973

include/Nazara/Graphics/Material.inl

File diff suppressed because it is too large Load Diff