Integrating github/staging through commit ab87ed9

Code/CryEngine/CrySystem/MiniGUI/DrawContext.cpp

@@ -98,8 +98,6 @@ void CDrawContext::StopDrawing()
     // Restore old flags that where set before our draw context.
     m_pAuxRender->SetRenderFlags(m_prevRenderFlags);
 
-    int width = gEnv->pRenderer->GetWidth();
-    int height = gEnv->pRenderer->GetHeight();
     gEnv->pRenderer->Unset2DMode(m_backupSceneMatrices);
 }
 
@@ -159,4 +157,4 @@ void CDrawContext::PopClientRect()
         m_currentStackLevel--;
     }
 }
-MINIGUI_END
+MINIGUI_END

Code/CryEngine/CrySystem/MiniGUI/MiniTable.cpp

@@ -151,7 +151,6 @@ void CMiniTable::AutoResize()
     if (nColumns)
     {
         int numEntries = m_columns[0].cells.size();
-        int numPages = numEntries / m_pageSize;
 
         //page index is now invalid, cap at max
         if ((m_pageNum * m_pageSize) > numEntries)