Merge branch 'master' into revise-texture-animation
Conflicts:doomsday/client/include/gl/gl_texmanager.hdoomsday/client/include/resource/materialbind.hdoomsday/client/include/resource/materialvariant.hdoomsday/client/include/resource/texturevariant.hdoomsday/client/include/resource/texturevariantspecification.hdoomsday/client/src/audio/s_environ.cppdoomsday/client/src/resource/material.cppdoomsday/client/src/resource/materialbind.cppdoomsday/client/src/resource/materials.cppdoomsday/client/src/resource/texturevariant.cppdoomsday/engine/include/render/rend_decor.hdoomsday/engine/include/resource/texturevariantspec.hdoomsday/engine/include/resource/texturevariantspecification.h
Added by danij almost 12 years ago
Added by
Merge branch 'master' into revise-texture-animation
Conflicts:
doomsday/client/include/gl/gl_texmanager.h
doomsday/client/include/resource/materialbind.h
doomsday/client/include/resource/materialvariant.h
doomsday/client/include/resource/texturevariant.h
doomsday/client/include/resource/texturevariantspecification.h
doomsday/client/src/audio/s_environ.cpp
doomsday/client/src/resource/material.cpp
doomsday/client/src/resource/materialbind.cpp
doomsday/client/src/resource/materials.cpp
doomsday/client/src/resource/texturevariant.cpp
doomsday/engine/include/render/rend_decor.h
doomsday/engine/include/resource/texturevariantspec.h
doomsday/engine/include/resource/texturevariantspecification.h