Skip to content

Commit 6c04f99

Browse files
baagaard-usgsbaagaard-usgs
committed
Merge branch 'baagaard/add-release-1.9.6'
* baagaard/add-release-1.9.6: Updated mode (+x). Updated copyright. Updated version info.
2 parents 0e4ad3d + fd40a26 commit 6c04f99

File tree

330 files changed

+340
-337
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

330 files changed

+340
-337
lines changed

‎CHANGES‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2016/06/14 (version 1.9.6)
2+
3+
Improve checking for parsing errors for spatial database files.
4+
15
2015/02/13 (version 1.9.5)
26

37
Added check for no data when validating UniformDB.

‎COPYING‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2010-2015 University of California, Davis
1+
Copyright (c) 2010-2016 University of California, Davis
22

33
Permission is hereby granted, free of charge, to any person obtaining
44
a copy of this software and associated documentation files (the

‎Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# This code was developed as part of the Computational Infrastructure
88
# for Geodynamics (http://geodynamics.org).
99
#
10-
# Copyright (c) 2010-2015 University of California, Davis
10+
# Copyright (c) 2010-2016 University of California, Davis
1111
#
1212
# See COPYING for license information.
1313
#

‎README‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// This code was developed as part of the Computational Infrastructure
88
// for Geodynamics (http://geodynamics.org).
99
//
10-
// Copyright (c) 2010-2015 University of California, Davis
10+
// Copyright (c) 2010-2016 University of California, Davis
1111
//
1212
// See COPYING for license information.
1313
//
@@ -17,12 +17,12 @@
1717
/** @mainpage
1818
*
1919
* @author Brad Aagaard
20-
* @date 2015/02/13
21-
* @version 1.9.5
20+
* @date 2016/06/14
21+
* @version 1.9.6
2222
*
2323
* @section summary Summary
2424
*
25-
* This directory tree contains SpatialData version 1.9.5. This package
25+
* This directory tree contains SpatialData version 1.9.6. This package
2626
* provides an interface to Proj.4 (cartographic projections library)
2727
* for converting coordinates among a variety of geographic projects
2828
* and local Cartesian coordinates and defines an interface for
@@ -47,7 +47,7 @@
4747
*
4848
* @section ops Optional software
4949
* @li pythia-0.8 and NumPy (>= 1.0)
50-
* @li CppUnit (for regression testing)
50+
* @li CppUnit (for unit testing)
5151
*
5252
* @section notes Notes
5353
*

‎applications/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# This code was developed as part of the Computational Infrastructure
88
# for Geodynamics (http://geodynamics.org).
99
#
10-
# Copyright (c) 2010-2015 University of California, Davis
10+
# Copyright (c) 2010-2016 University of California, Davis
1111
#
1212
# See COPYING for license information.
1313
#

‎applications/gensimpledb.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# This code was developed as part of the Computational Infrastructure
88
# for Geodynamics (http://geodynamics.org).
99
#
10-
# Copyright (c) 2010-2015 University of California, Davis
10+
# Copyright (c) 2010-2016 University of California, Davis
1111
#
1212
# See COPYING for license information.
1313
#

‎applications/pyconvert.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# This code was developed as part of the Computational Infrastructure
88
# for Geodynamics (http://geodynamics.org).
99
#
10-
# Copyright (c) 2010-2015 University of California, Davis
10+
# Copyright (c) 2010-2016 University of California, Davis
1111
#
1212
# See COPYING for license information.
1313
#

‎check.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# This code was developed as part of the Computational Infrastructure
88
# for Geodynamics (http://geodynamics.org).
99
#
10-
# Copyright (c) 2010-2015 University of California, Davis
10+
# Copyright (c) 2010-2016 University of California, Davis
1111
#
1212
# See COPYING for license information.
1313
#

‎configure.ac‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
# This code was developed as part of the Computational Infrastructure
88
# for Geodynamics (http://geodynamics.org).
99
#
10-
# Copyright (c) 2010-2015 University of California, Davis
10+
# Copyright (c) 2010-2016 University of California, Davis
1111
#
1212
# See COPYING for license information.
1313
#
1414
# ----------------------------------------------------------------------
1515
#
1616

1717
AC_PREREQ(2.59)
18-
AC_INIT([spatialdata], [1.9.5], [[email protected]])
18+
AC_INIT([spatialdata], [1.9.6], [[email protected]])
1919
AC_CONFIG_HEADER([portinfo])
2020
AC_CONFIG_AUX_DIR([./aux-config])
2121
AC_CONFIG_MACRO_DIR([m4])

‎doc/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# This code was developed as part of the Computational Infrastructure
88
# for Geodynamics (http://geodynamics.org).
99
#
10-
# Copyright (c) 2010-2015 University of California, Davis
10+
# Copyright (c) 2010-2016 University of California, Davis
1111
#
1212
# See COPYING for license information.
1313
#

0 commit comments

Comments
 (0)