Russ Rew a62c9d3059 Fix conflicts after merge

2015-08-02 17:29:36 -06:00

..

bigf1.cdl

moving to trunk subdir

2010-06-03 13:24:43 +00:00

bigf2.cdl

moving to trunk subdir

2010-06-03 13:24:43 +00:00

bigf3.cdl

moving to trunk subdir

2010-06-03 13:24:43 +00:00

bigr1.cdl

moving to trunk subdir

2010-06-03 13:24:43 +00:00

bigr2.cdl

moving to trunk subdir

2010-06-03 13:24:43 +00:00

bigr3.cdl

moving to trunk subdir

2010-06-03 13:24:43 +00:00

c0.cdl

Cleanup clang warnings.

2015-08-02 17:22:50 -06:00

CMakeLists.txt

Updated CMakelists to remove debug, release subdirectories on Windows. Updating shell scripts to work with MSYS paths.

2015-02-02 14:46:50 -07:00

depend

moving to trunk subdir

2010-06-03 13:24:43 +00:00

escapes.c

moving to trunk subdir

2010-06-03 13:24:43 +00:00

generic.h

moving to trunk subdir

2010-06-03 13:24:43 +00:00

genlib.c

fix a cosmetic issue with config.h

2012-08-01 17:18:58 +00:00

genlib.h

In load.c, follow autoconf recommendations for including config.h (www.gnu.org/software/autoconf/manual/autoconf-2.64/html_node/Configuration-Headers.html)

2013-10-25 12:46:31 -06:00

getfill.c

moving to trunk subdir

2010-06-03 13:24:43 +00:00

init.c

moving to trunk subdir

2010-06-03 13:24:43 +00:00

lfs-tests

moving to trunk subdir

2010-06-03 13:24:43 +00:00

load.c

codecleanup

2015-04-18 13:07:04 +02:00

main.c

More cleanups from clang warnings.

2015-08-02 17:23:32 -06:00

Makefile.am

Historically

2013-05-15 17:37:04 +00:00

ncgen3.1

hyphens used as minus signs

2015-01-16 13:12:11 +01:00

ncgen.h

Many changes to address NCF-177 (renaming dimensions and variables). Also

2013-11-30 23:20:28 -06:00

ncgen.l

Historically

2013-05-15 17:37:04 +00:00

ncgen.y

fix a cosmetic issue with config.h

2012-08-01 17:18:58 +00:00

ncgentab.c

Historically

2013-05-15 17:37:04 +00:00

ncgentab.h

Historically

2013-05-15 17:37:04 +00:00

ncgenyy.c

Historically

2013-05-15 17:37:04 +00:00

run_nc4_tests.sh

Added additional tests in CMake

2012-08-10 20:55:07 +00:00

run_tests2.sh

moving to trunk subdir

2010-06-03 13:24:43 +00:00

run_tests.sh

Added additional tests in CMake

2012-08-10 20:55:07 +00:00

XGetopt.c

Merge from latest netcdf-cmake branch.

2012-12-05 18:35:42 +00:00