Christoph Oelckers 61c91f05fc Merge branch '3.0_work' ... # Conflicts: # src/gl/scene/gl_portal.cpp # src/r_plane.cpp		2017-03-12 20:31:34 +01:00
..
vm.h	- did a bit of header cleanup to reduce the dependency on dobject.h.	2017-03-09 23:30:42 +01:00
vmexec.cpp	Fixed compilation of Debug configuration	2017-03-05 11:39:25 +02:00
vmexec.h	Merge branch '3.0_work'	2017-03-12 20:31:34 +01:00
vmframe.cpp	Implemented implicit 'protected' inheritance in virtual functions	2017-03-05 09:49:31 +01:00
vmops.h	- refactored the scope check for VirtualScope calls.	2017-03-07 22:17:48 +01:00