Revision b60bbb87 - Merge branch 'master' of ssh://github.com/skyjake/Doomsday-Engine Conflicts:... - Doomsday Engine - Tracker

« Previous | Next »

Revision b60bbb87

Added by skyjake about 12 years ago

ID b60bbb87515fca3c8020be36396802fdf7800400
Parent 4eebc98a, 6ccce087
Child 0bd65f26, 3716dcf1

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

Conflicts:
doomsday/libdeng2/include/de/data/string.h
doomsday/libdeng2/src/data/string.cpp

Files

added
modified
copied
renamed
deleted