Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 04:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '19561' of https://github.com/thoys/hifi into 19561

Browse source 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
This commit is contained in:
Thijs Wenker 2014-04-29 22:07:03 +02:00
commit 2ba39f951a
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.h
View file

@ -126,7 +126,6 @@ public:
void loadScripts();
QString getPreviousScriptLocation();
void setPreviousScriptLocation(QString previousScriptLocation);
void storeSizeAndPosition();
void clearScriptsBeforeRunning();
void saveScripts();