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
409409 return qApp->getDeviceSize();
410410 }
411411
412−int WindowScriptingInterface::getLastDominConnectionError() const {
412+int WindowScriptingInterface::getLastDomainConnectionError() const {
413413 return DependencyManager::get<NodeList>()->getDomainHandler().getLastDomainConnectionError();
414414 }
415415

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t