Merge branch 'normal-texcoord-indices' of github.com:syoyo/tinyobjloader into normal-texcoord-indices

Browse Source

Conflicts:
	tiny_obj_loader.cc

...

This commit is contained in:

Syoyo Fujita

2015-06-24 21:50:23 +09:00

parent 8b86d6383c e568dd11f7

commit 47aad5a129

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