Merge branch 'master' into revise-texture-animation
Conflicts:doomsday/engine/api/dd_maptypes.hdoomsday/engine/include/map/p_maptypes.hdoomsday/engine/include/resource/material.h
Added by danij over 11 years ago
Added by
Merge branch 'master' into revise-texture-animation
Conflicts:
doomsday/engine/api/dd_maptypes.h
doomsday/engine/include/map/p_maptypes.h
doomsday/engine/include/resource/material.h