Merge branch 'oculus-rift' of https://github.com/cmbruns/Doomsday-Engine into oculus-rift
Conflicts: doomsday/client/src/ui/clientwindow.cpp
Merge branch 'oculus-rift' of https://github.com/cmbruns/Doomsday-Engine into oculus-rift
Conflicts:
doomsday/client/src/ui/clientwindow.cpp