Merge branch 'master' into ringzero+master
Conflicts:doomsday/CMakeLists.txtdoomsday/engine/portable/include/r_main.hdoomsday/engine/portable/src/dd_main.cdoomsday/engine/portable/src/s_main.cdoomsday/engine/portable/src/ui_mpi.cdoomsday/plugins/exampleplugin/CMakeLists.txtdoomsday/plugins/jheretic/src/p_mobj.c
Added by danij almost 13 years ago
Added by
Merge branch 'master' into ringzero+master
Conflicts:
doomsday/CMakeLists.txt
doomsday/engine/portable/include/r_main.h
doomsday/engine/portable/src/dd_main.c
doomsday/engine/portable/src/s_main.c
doomsday/engine/portable/src/ui_mpi.c
doomsday/plugins/exampleplugin/CMakeLists.txt
doomsday/plugins/jheretic/src/p_mobj.c