Project

General

Profile

« Previous | Next » 

Revision 0f2544de

Added by skyjake over 11 years ago

Merge branch 'master' of ssh://github.com/skyjake/Doomsday-Engine

Conflicts:
doomsday/client/include/resource/textures.h
doomsday/client/src/resource/texturemanifest.cpp
doomsday/client/src/resource/textures.cpp
doomsday/client/src/resource/texturescheme.cpp

Files

  • added
  • modified
  • copied
  • renamed
  • deleted