Merge branch 'master' into scriptsys
The engine's de::FS was renamed de::FS1.
Conflicts: doomsday/doomsday.pro doomsday/engine/portable/src/fs_main.cpp doomsday/engine/portable/src/lumpindex.cpp
Merge branch 'master' into scriptsys
The engine's de::FS was renamed de::FS1.
Conflicts:
doomsday/doomsday.pro
doomsday/engine/portable/src/fs_main.cpp
doomsday/engine/portable/src/lumpindex.cpp