Project

General

Profile

« Previous | Next » 

Revision 2696415f

Added by danij almost 13 years ago

Merge branch 'master' into ringzero+master

Conflicts:
doomsday/engine/portable/src/r_main.c
doomsday/plugins/common/include/r_common.h
doomsday/plugins/common/src/r_common.c

Files

  • added
  • modified
  • copied
  • renamed
  • deleted