History

Merge branch 'master' of https://github.com/worklist/hifi into kinected

Andrzej Kapolka committed 13 years ago

Commit 4f01db62 parents c4deeed bf475767 files · +41 −23Browse files

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

Unified · Split

interface/src/Application.cpp+1−1
@@ -350,7 +350,7 @@ void Application::initializeGL() { · 349 unmodified lines
350 const char LOGSTASH_INTERFACE_START_TIME_KEY[] = "interface-start-time";350 const char LOGSTASH_INTERFACE_START_TIME_KEY[] = "interface-start-time";
351 351
352 // ask the Logstash class to record the startup time352 // ask the Logstash class to record the startup time
353 Logstash::stashValue(LOGSTASH_INTERFACE_START_TIME_KEY, startupTime);353 Logstash::stashValue(STAT_TYPE_TIMER, LOGSTASH_INTERFACE_START_TIME_KEY, startupTime);
354 }354 }
355 355
356 // update before the first render356 // update before the first render

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