Project

General

Profile

« Previous | Next » 

Revision ae93860c

Added by skyjake over 9 years ago

Merge branch 'master' into app+player-cleanup

  1. Conflicts:
  2. doomsday/apps/client/src/busymode.cpp
  3. doomsday/apps/client/src/dd_pinit.cpp
  4. doomsday/apps/client/src/dd_plugin.cpp
  5. doomsday/apps/client/src/sys_system.cpp

Files

  • added
  • modified
  • copied
  • renamed
  • deleted