Merge branch 'master' of ssh://github.com/skyjake/Doomsday-Engine
Conflicts: doomsday/engine/portable/src/dd_main.cpp
Note appropriate Doxygen formatting of the 'pre' tag (checked usingthe final HTML output).
Added by skyjake about 12 years ago
Added by
Merge branch 'master' of ssh://github.com/skyjake/Doomsday-Engine
Conflicts:
doomsday/engine/portable/src/dd_main.cpp
Note appropriate Doxygen formatting of the 'pre' tag (checked using
the final HTML output).