Merge branch 'master' into fix-rotated-rectangles

OpenGeoscience · May 2, 2017 · 5d98363 · 5d98363
2 parents 97ac68a + 6249701
commit 5d98363
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -66,7 +66,7 @@
 
 # General information about the project.
 project = u'geojs'
-copyright = u'2014, Kitware, Inc.'
+copyright = u'Kitware, Inc.'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

diff --git a/examples/common/templates/index.jade b/examples/common/templates/index.jade
@@ -63,7 +63,7 @@ html(lang="en")
                 h4.modal-title !{about.title || title}
               .modal-body
                 p.text-left !{about.text}
-                p.text-right © 2014, Kitware, Inc.
+                p.text-right © Kitware, Inc.
               .modal-footer
                 button.btn.btn-primary(data-dismiss="modal" data-target="#about-modal") Close
 

diff --git a/src/index.js b/src/index.js
@@ -1,7 +1,7 @@
 // License headers that will be preserved in distributed bundles.
 /**
  * GeoJS
- * @copyright 2013-2016, Kitware, Inc.
+ * @copyright 2013-2017, Kitware, Inc.
  * @license Apache-2.0
  *
  * Bundled with the following libraries: