Project

General

Profile

« Previous | Next » 

Revision 557a1c8e

Added by danij about 13 years ago

Merge branch 'master' into ringzero+master

Conflicts:
distrib/win32/setup.iss.template
doomsday/plugins/common/src/hu_log.c
doomsday/plugins/jhexen/src/p_acs.c

Files

  • added
  • modified
  • copied
  • renamed
  • deleted