Revision 5a247df8 - Merge branch 'master' of ssh://github.com/skyjake/Doomsday-Engine # Conflict... - Doomsday Engine - Tracker

« Previous | Next »

Revision 5a247df8

Added by skyjake about 8 years ago

ID 5a247df867c292c6690a07649505f9627365eb4a
Parent 41143f2f, 5d86cdff
Child bc0c0f46

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

Conflicts:
doomsday/apps/client/src/resource/materialanimator.cpp

Files

added
modified
copied
renamed
deleted