diff options
| author | Mike Turvey <mturvey6@gmail.com> | 2017-03-11 09:00:58 -0700 |
|---|---|---|
| committer | Mike Turvey <mturvey6@gmail.com> | 2017-03-11 09:00:58 -0700 |
| commit | ba38ddcc4c3d74c00139ceff9b45481259d80fc7 (patch) | |
| tree | ba1efc8aa8f7a76aa9f9f831aff16ea86fdc2b23 /calibrate_client.c | |
| parent | 1d9db12d7e115f2b8994f014e37f1086c17e90fd (diff) | |
| parent | cdc60d110a9cd69c5bd8c0ac4e67db1ce7cecc93 (diff) | |
| download | libsurvive-ba38ddcc4c3d74c00139ceff9b45481259d80fc7.tar.gz libsurvive-ba38ddcc4c3d74c00139ceff9b45481259d80fc7.tar.bz2 | |
Merge remote-tracking branch 'remotes/upstream/master' into Octavios_Algorithm
Conflicts:
redist/linmath.c
Diffstat (limited to 'calibrate_client.c')
| -rw-r--r-- | calibrate_client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/calibrate_client.c b/calibrate_client.c index b15b9db..f28520b 100644 --- a/calibrate_client.c +++ b/calibrate_client.c @@ -141,7 +141,7 @@ void * GuiThread( void * v ) int main() { - +/* config_init(); config_read("config.json"); config_set_str(&global_config_values, "Hello","World!"); @@ -156,7 +156,7 @@ int main() // config_save("config.json"); - +*/ ctx = survive_init( 1 ); |