Merge remote-tracking branch 'smally/platform_type_consistency' into platform-type-consistency

Conflicts:
	Engine/source/platform/platformCPUCount.cpp
This commit is contained in:
Daniel Buckmaster 2014-04-04 13:43:25 +11:00
commit 87d9e245b7
210 changed files with 896 additions and 896 deletions

View file

@ -633,13 +633,13 @@ void SettingSaveNode::buildDocument(SimXMLDocument *document, bool skipWrite)
document->addText(mValue);
} else
{
for(int i=0; i<mSettingNodes.size(); i++)
for(S32 i=0; i<mSettingNodes.size(); i++)
{
SettingSaveNode *node = mSettingNodes[i];
node->buildDocument(document);
}
for(int i=0; i<mGroupNodes.size(); i++)
for(S32 i=0; i<mGroupNodes.size(); i++)
{
SettingSaveNode *node = mGroupNodes[i];
node->buildDocument(document);