Merge branch 'master' into miami

# Conflicts:
#	src/control/Darkel.cpp
#	src/core/main.cpp
This commit is contained in:
Sergeanur
2020-08-15 15:13:46 +03:00
10 changed files with 96 additions and 7 deletions

View File

@ -50,6 +50,15 @@ RsCameraBeginUpdate(RwCamera * camera)
return psCameraBeginUpdate(camera);
}
/*
*****************************************************************************
*/
RwImage*
RsGrabScreen(RwCamera *camera)
{
return psGrabScreen(camera);
}
/*
*****************************************************************************
*/