Skip to content
Permalink
Browse files

Can't include files on Github - add LICENSE manually and update year

  • Loading branch information...
geographika committed Jul 25, 2018
1 parent def4512 commit 691ddc1a9c7dc5d94a8bc814b5118506b7727c00
Showing with 31 additions and 2 deletions.
  1. +1 −1 LICENSE
  2. +30 −1 README.rst
@@ -6,7 +6,7 @@
* Author: Thomas Bonfort and the MapServer team.
*
******************************************************************************
* Copyright (c) 1996-2012 Regents of the University of Minnesota.
* Copyright (c) 1996-2018 Regents of the University of Minnesota.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,36 @@ Questions relating to MapCache use and development can be asked on the MapServer
License
-------

.. include:: LICENSE
::

/******************************************************************************
*
* Project: MapServer
* Purpose: MapCache tile caching program.
* Author: Thomas Bonfort and the MapServer team.
*
******************************************************************************
* Copyright (c) 1996-2018 Regents of the University of Minnesota.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies of this Software or works derived from this Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*****************************************************************************/


.. |Build Status| image:: https://travis-ci.org/mapserver/mapcache.svg?branch=master
:target: https://travis-ci.org/mapserver/mapcache

0 comments on commit 691ddc1

Please sign in to comment.
You can’t perform that action at this time.