Merge branch 'master' into working

This commit is contained in:
Sean Barrett
2014-09-18 07:10:18 -07:00
13 changed files with 3764 additions and 21 deletions

View File

@ -106,10 +106,18 @@ SOURCE=..\stb_dxt.h
# End Source File
# Begin Source File
SOURCE=..\stb_herringbone_wang_tile.h
# End Source File
# Begin Source File
SOURCE=..\stb_image.h
# End Source File
# Begin Source File
SOURCE=..\stb_image_resize.h
# End Source File
# Begin Source File
SOURCE=..\stb_image_write.h
# End Source File
# Begin Source File