diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-06-27 06:56:26 -0700 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-06-27 06:56:26 -0700 |
| commit | f37a3a84fafb91bcfc109fed95aa6d42726f1bf7 (patch) | |
| tree | cde1e5f47f191beb4a9cefcd87872aef53b5fcec /src/main.h | |
| parent | e261cc9e8fa67c9020fa0a82bd1a7041ecd351a0 (diff) | |
| parent | 13cf5425db613dc0a4323c87a4988bb18fb87aca (diff) | |
| download | minetest-f37a3a84fafb91bcfc109fed95aa6d42726f1bf7.tar.gz minetest-f37a3a84fafb91bcfc109fed95aa6d42726f1bf7.tar.bz2 minetest-f37a3a84fafb91bcfc109fed95aa6d42726f1bf7.zip | |
Merge pull request #13 from Bahamada/upstream_merge
Upstream merge
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main.h b/src/main.h index fcf150f87..450525c26 100644 --- a/src/main.h +++ b/src/main.h @@ -28,6 +28,10 @@ extern Settings g_settings; #include "tile.h" extern ITextureSource *g_texturesource; +// Global profiler +#include "profiler.h" +extern Profiler g_profiler; + // Debug streams #include <fstream> |