Revision 55fa33f1 - Merge branch 'master' of github.com:skyjake/Doomsday-Engine Conflicts: doom... - Doomsday Engine - Tracker

« Previous | Next »

Revision 55fa33f1

Added by skyjake almost 11 years ago

ID 55fa33f1e651b6d8103a60b68151d47717c33b46
Parent 7d0d4575, 6c186bc0
Child 47f2bfc5

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

Conflicts:
doomsday/client/src/ui/editors/rendererappearanceeditor.cpp

Files

added
modified
copied
renamed
deleted