Project

General

Profile

« Previous | Next » 

Revision 9747ecec

Added by danij almost 13 years ago

Merge branch 'master' into ringzero+master

Conflicts:
doomsday/plugins/common/common.pri
doomsday/plugins/jdoom/src/p_mobj.c
doomsday/plugins/jdoom64/src/p_mobj.c
doomsday/plugins/jheretic/src/p_mobj.c
doomsday/plugins/jhexen/src/m_cheat.c

Files

  • added
  • modified
  • copied
  • renamed
  • deleted