Revision 328a88cd - Merge branch 'master' into cmake-build Conflicts: doomsday/apps/client/incl... - Doomsday Engine - Tracker

« Previous | Next »

Revision 328a88cd

Added by skyjake over 9 years ago

ID 328a88cd568a1b45ab58364fa469e199a18f4875
Parent 1ee4e51f, 1cbb03ef
Child 112b1386, d0854b9b, 7057d0bd

Merge branch 'master' into cmake-build

Conflicts:
doomsday/apps/client/include/render/rend_clip.h
doomsday/apps/client/src/render/rend_clip.cpp

Files

added
modified
copied
renamed
deleted