Project

General

Profile

« Previous | Next » 

Revision dc5e68ab

Added by skyjake about 13 years ago

Merge branch 'master' into ringzero+master

Conflicts:
distrib/win32/setup.iss.template
doomsday/engine/portable/include/dd_version.h
doomsday/engine/portable/src/dd_main.c
doomsday/engine/portable/src/dd_pinit.c
doomsday/engine/portable/src/gl_font.c
doomsday/engine/portable/src/gl_main.c
doomsday/engine/portable/src/sys_system.c
doomsday/engine/unix/src/sys_dylib.c
doomsday/engine/win32/include/dd_winit.h
doomsday/engine/win32/src/dd_winit.c
doomsday/engine/win32/src/sys_audiod_loader.c
doomsday/plugins/jdoom/api/jdoom.def
doomsday/plugins/jdoom/res/jdoom.rc
doomsday/plugins/jdoom64/api/jdoom64.def
doomsday/plugins/jdoom64/res/jdoom64.rc
doomsday/plugins/jheretic/api/jheretic.def
doomsday/plugins/jheretic/res/jheretic.rc
doomsday/plugins/jhexen/api/jhexen.def
doomsday/plugins/jhexen/res/jhexen.rc
doomsday/plugins/jhexen/src/st_stuff.c

Files

  • added
  • modified
  • copied
  • renamed
  • deleted