Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-17 18:16:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Philip Rosedale 2013-05-31 14:21:38 -07:00
commit 088e9d0aef
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -774,9 +774,9 @@ void Application::readSettingsFile() {
} }
} }
} }
}
fclose(settingsFile); fclose(settingsFile);
}
} }
void Application::saveSettingsFile() { void Application::saveSettingsFile() {

1
libraries/shared/src/SharedUtil.h
View file

@ -10,6 +10,7 @@
#define __hifi__SharedUtil__ #define __hifi__SharedUtil__
#include <stdint.h> #include <stdint.h>
#include <unistd.h>
#include <math.h> #include <math.h>
#ifdef _WIN32 #ifdef _WIN32