Doomsday Engine

Merge branch 'master' into ringzero+master

Conflicts:
doomsday/build/win32/doomsday_cl.rsp
doomsday/build/win32/vcbuild.bat
doomsday/engine/api/doomsday.def
doomsday/engine/api/doomsday.h
doomsday/engine/mac/src/qt.c
doomsday/engine/portable/include/gl_defer.h
doomsday/engine/portable/include/m_string.h
doomsday/engine/portable/include/net_buf.h
doomsday/engine/portable/include/net_main.h
doomsday/engine/portable/include/sv_def.h
doomsday/engine/portable/src/cl_world.c
doomsday/engine/portable/src/con_main.c
doomsday/engine/portable/src/gl_defer.c
doomsday/engine/portable/src/gl_texmanager.c
doomsday/engine/portable/src/m_string.c
doomsday/engine/portable/src/net_buf.c
doomsday/engine/portable/src/net_main.c
doomsday/engine/portable/src/s_mus.c
doomsday/engine/portable/src/sv_frame.c
doomsday/engine/portable/src/sv_main.c
doomsday/engine/portable/src/sys_system.c
doomsday/plugins/common/include/d_netcl.h
doomsday/plugins/common/include/d_netsv.h
doomsday/plugins/common/src/d_net.c
doomsday/plugins/common/src/d_netcl.c
doomsday/plugins/common/src/d_netsv.c
doomsday/plugins/common/src/hu_stuff.c
doomsday/plugins/common/src/m_multi.c
doomsday/plugins/common/src/p_mapsetup.c
doomsday/plugins/common/src/p_start.c
doomsday/plugins/common/src/p_user.c
doomsday/plugins/jdoom/src/d_api.c
doomsday/plugins/jdoom64/src/d_api.c
doomsday/plugins/jheretic/src/h_api.c
doomsday/plugins/jheretic/src/p_mobj.c
doomsday/plugins/jhexen/src/p_mobj.c
doomsday/plugins/jhexen/src/sn_sonix.c
doomsday/plugins/jhexen/src/x_api.c