Merge branch 'common-episode-definition' of github.com:skyjake/Doomsday-Engine into common-episode-definition
Conflicts:doomsday/client/src/def_main.cppdoomsday/plugins/idtech1converter/src/mapinfotranslator.cpp
Added by danij almost 10 years ago
Added by
Merge branch 'common-episode-definition' of github.com:skyjake/Doomsday-Engine into common-episode-definition
Conflicts:
doomsday/client/src/def_main.cpp
doomsday/plugins/idtech1converter/src/mapinfotranslator.cpp