mirror of
https://github.com/Unidata/netcdf-c.git
synced 2025-03-19 17:30:27 +08:00
Merge branch 'master' into gh479-conflict-resolution
This commit is contained in:
commit
d7ead42c3e
@ -12,7 +12,7 @@ See \ref copyright file for copying and redistribution conditions.
|
||||
#include <stdio.h>
|
||||
#include <stdarg.h>
|
||||
#include "netcdf.h"
|
||||
#include "math.h"
|
||||
#include <math.h>
|
||||
|
||||
/** \defgroup v2_api The Version 2 API
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
#include <nc_tests.h>
|
||||
#include "err_macros.h"
|
||||
#include "netcdf.h"
|
||||
#include "math.h"
|
||||
#include <math.h>
|
||||
|
||||
#define FILE_NAME "tst_converts2.nc"
|
||||
#define VAR_NAME "Monkey"
|
||||
|
Loading…
x
Reference in New Issue
Block a user