History

Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer

Brad Hefta-Gaub committed 9 years ago

Commit be62df22 parents 2ba4fee 173e04a5 files · +52 −36Browse files

Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all

Unified · Split

interface/src/Application.cpp+0−4
@@ -66,7 +66,6 @@ · 65 unmodified lines
6666 #include <ErrorDialog.h>
6767 #include <FileScriptingInterface.h>
6868 #include <Finally.h>
69−#include <FingerprintUtils.h>
7069 #include <FramebufferCache.h>
7170 #include <gpu/Batch.h>
7271 #include <gpu/Context.h>
@@ -614,9 +613,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 541 unmodified lines
614613
615614 Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us
616615
617− // TODO: This is temporary, while developing
618− FingerprintUtils::getMachineFingerprint();
619− // End TODO
620616 auto nodeList = DependencyManager::get<NodeList>();
621617
622618 // Set up a watchdog thread to intentionally crash the application on deadlocks

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