History

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

Brad Hefta-Gaub committed 11 years ago

Commit 54a45f32 parents 94b273a 096a6cb158 files · +3655 −2709Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.h (1 of 158 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.h+0−3
@@ -162,10 +162,7 @@ protected: · 161 unmodified lines
162162 QHash<QTimer*, QScriptValue> _timerFunctionMap;
163163 QSet<QUrl> _includedURLs;
164164 bool _wantSignals = true;
165−
166165 QHash<EntityItemID, EntityScriptDetails> _entityScripts;
167−
168−
169166 private:
170167 void init();
171168 QString getFilename() const;

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