History

Merge branch 'interstitalMerged' of https://github.com/wayne-chen/hifi into interstitalMerged

Wayne Chen committed 8 years ago

Commit 20cab872 parents 30e9d57 2267085194 files · +2643 −1627Browse files

Showing the changes to interface/src/scripting/WindowScriptingInterface.cpp (1 of 194 files). Show all

Unified · Split

interface/src/scripting/WindowScriptingInterface.cpp+1−1
@@ -409,7 +409,7 @@ glm::vec2 WindowScriptingInterface::getDeviceSize() const { · 408 unmodified lines
409 return qApp->getDeviceSize();409 return qApp->getDeviceSize();
410}410}
411 411
412int WindowScriptingInterface::getLastDominConnectionError() const {412int WindowScriptingInterface::getLastDomainConnectionError() const {
413 return DependencyManager::get<NodeList>()->getDomainHandler().getLastDomainConnectionError();413 return DependencyManager::get<NodeList>()->getDomainHandler().getLastDomainConnectionError();
414}414}
415 415