Merge branch 'master' into thread-safe-lump-cache
Conflicts:doomsday/engine/portable/src/abstractfile.cppdoomsday/engine/portable/src/dd_games.cppdoomsday/engine/portable/src/dd_wad.cppdoomsday/engine/portable/src/fs_main.cppdoomsday/engine/portable/src/wadfile.cpp
Added by danij about 12 years ago
Added by
Merge branch 'master' into thread-safe-lump-cache
Conflicts:
doomsday/engine/portable/src/abstractfile.cpp
doomsday/engine/portable/src/dd_games.cpp
doomsday/engine/portable/src/dd_wad.cpp
doomsday/engine/portable/src/fs_main.cpp
doomsday/engine/portable/src/wadfile.cpp