Revision 0a938411 - Merge branch 'master' of github.com:skyjake/Doomsday-Engine Conflicts: dooms... - Doomsday Engine - Tracker

« Previous | Next »

Revision 0a938411

Added by danij about 12 years ago

ID 0a9384113921ffd3a26c3084d2016044720be495
Parent dc7e74ab, 71751268
Child f75b2b78

Merge branch 'master' of github.com:skyjake/Doomsday-Engine

Conflicts:
doomsday/engine/portable/src/filehandle.cpp
doomsday/libdeng2/src/data/string.cpp

Files

added
modified
copied
renamed
deleted