Skip to content

Commit

Permalink
Merge pull request #264 from maxmind/greg/1.6.0
Browse files Browse the repository at this point in the history
Prepare for 1.6.0
  • Loading branch information
horgh authored Apr 29, 2021
2 parents cc2d3ca + 538637f commit 2d0e6b7
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*.a
*.la
*.lo
*.o
Expand Down Expand Up @@ -25,13 +26,11 @@
/man
/missing
/src/libmaxminddb.pc
/src/libmaxminddb.a
/src/test-data-pool
/t/*.log
/t/*.trs
/t/*_t
/t/*-t
/t/libtap.a
/test-driver
\#*\#
aclocal.m4
Expand Down
8 changes: 7 additions & 1 deletion Changes.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## 1.5.3
## 1.6.0 - 2021-04-29

* This release includes several improvements to the CMake build. In
particular:
Expand All @@ -9,6 +9,11 @@
Pull request by Jan Včelák. GitHub #258.
* `target_include_directories` now works as expected. Pull request by Jan
Včelák. GitHub #259.
* DLLs are now installed on Windows when `libmaxminddb` is built as a
shared library. Pull request by Jan Včelák. GitHub #261.
* When built as a dynamic library on Windows, all symbols are now exported.
Pull request by Jan Včelák. GitHub #262.


## 1.5.2 - 2021-02-18

Expand All @@ -17,6 +22,7 @@
lead to issues in low memory situations or when resource limits had been
set. Reported by cve-reporting. GitHub #252.


## 1.5.1 - 2021-02-18

* The formatting of the manpages has been improved and the script that
Expand Down
4 changes: 2 additions & 2 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2013-2014 MaxMind, Inc.
Copyright 2013-2021 MaxMind, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -10,4 +10,4 @@ Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ Use `make safedist` to check the resulting tarball.

# Copyright and License

Copyright 2013-2021 MaxMind, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
Expand Down

0 comments on commit 2d0e6b7

Please sign in to comment.