Project

General

Profile

« Previous | Next » 

Revision c0eaefb4

Added by danij about 13 years ago

Merge branch 'master' into ringzero+master

Conflicts:
doomsday/plugins/jdoom/src/d_main.c
doomsday/plugins/jdoom64/src/d_main.c
doomsday/plugins/jheretic/src/h_main.c
doomsday/plugins/jhexen/src/h2_main.c

Files

  • added
  • modified
  • copied
  • renamed
  • deleted