Merge branch 'master' into common-episode-definition
Conflicts:doomsday/plugins/common/include/hu_lib.hdoomsday/plugins/common/include/m_ctrl.hdoomsday/plugins/common/src/m_ctrl.cpp
Added by danij about 10 years ago
Added by
Merge branch 'master' into common-episode-definition
Conflicts:
doomsday/plugins/common/include/hu_lib.h
doomsday/plugins/common/include/m_ctrl.h
doomsday/plugins/common/src/m_ctrl.cpp