<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
Jérôme Benoit pushed to branch master
at <a href="https://salsa.debian.org/debian-gis-team/merkaartor">Debian GIS Project / merkaartor</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://salsa.debian.org/debian-gis-team/merkaartor/commit/900ce84cb0905ebc9312558a4f8388cd8667973e">900ce84c</a></strong>
<div>
<span>by Jerome Benoit</span>
<i>at 2020-02-07T11:37:14+04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Debian pre-patch 0.18.4+ds-0
</pre>
</li>
<li>
<strong><a href="https://salsa.debian.org/debian-gis-team/merkaartor/commit/9029026cec822da6c56365fa3e67ff3ed5228d65">9029026c</a></strong>
<div>
<span>by Jerome Benoit</span>
<i>at 2020-02-07T11:38:35+04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">New upstream version 0.18.4</pre>
</li>
<li>
<strong><a href="https://salsa.debian.org/debian-gis-team/merkaartor/commit/690bb1ae807f86fe09643bc55ed04d51b34fe4f7">690bb1ae</a></strong>
<div>
<span>by Jerome Benoit</span>
<i>at 2020-02-07T11:38:49+04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Update upstream source from tag 'upstream/0.18.4'
Update to upstream version '0.18.4'
with Debian dir cef422a6655fe5b351586e46b3045c86c88f61b8</pre>
</li>
<li>
<strong><a href="https://salsa.debian.org/debian-gis-team/merkaartor/commit/4c2050345e71960d2dd81757e273f8d8097d4507">4c205034</a></strong>
<div>
<span>by Jerome Benoit</span>
<i>at 2020-02-07T11:39:18+04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">New upstream version 0.18.4+ds</pre>
</li>
<li>
<strong><a href="https://salsa.debian.org/debian-gis-team/merkaartor/commit/3adbeaf976c621b2ee4e7b6150d37776cd4a6372">3adbeaf9</a></strong>
<div>
<span>by Jerome Benoit</span>
<i>at 2020-02-07T11:39:23+04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Update upstream source from tag 'upstream/0.18.4+ds'
Update to upstream version '0.18.4+ds'
with Debian dir cef422a6655fe5b351586e46b3045c86c88f61b8</pre>
</li>
<li>
<strong><a href="https://salsa.debian.org/debian-gis-team/merkaartor/commit/b176da67aac5a24f69891e7d4251e6c1660b4208">b176da67</a></strong>
<div>
<span>by Jerome Benoit</span>
<i>at 2020-02-07T15:03:36+04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Debian patch 0.18.4+ds-1
</pre>
</li>
<li>
<strong><a href="https://salsa.debian.org/debian-gis-team/merkaartor/commit/25e98d5f5305878474c85d1187ea400fde1a7f0f">25e98d5f</a></strong>
<div>
<span>by Jerome Benoit</span>
<i>at 2020-02-07T15:18:29+04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Merge branch 'master' of salsa.debian.org:debian-gis-team/merkaartor
</pre>
</li>
</ul>
<h4>18 changed files:</h4>
<ul>
<li class="file-stats">
<a href="#875aad6d7c66ed9cbdfe44d32de230a42937deb1">
<span class="deleted-file">
−
.drone.sec
</span>
</a>
</li>
<li class="file-stats">
<a href="#762d7ccaead4b306c37a6a16532be092f3a7d97d">
<span class="deleted-file">
−
.drone.yml
</span>
</a>
</li>
<li class="file-stats">
<a href="#a5cc2925ca8258af241be7e5b0381edf30266302">
<span class="deleted-file">
−
.gitignore
</span>
</a>
</li>
<li class="file-stats">
<a href="#1f41bcfb7377ca9ed3ac4a08dd11e04569e48413">
<span class="deleted-file">
−
.indent.pro
</span>
</a>
</li>
<li class="file-stats">
<a href="#dea01dd89a3b602828e630677fde5d77c06441c8">
<span class="deleted-file">
−
.travis.yml
</span>
</a>
</li>
<li class="file-stats">
<a href="#edeac18b3223cd80f8c42d413f34744f4fe277bd">
<span class="deleted-file">
−
.tx/config
</span>
</a>
</li>
<li class="file-stats">
<a href="#593f3e38540ac60380c56e737056605bc6dcbb9c">
3rdparty/qtsingleapplication-2.6_1-opensource/src/qtlockedfile_win.cpp
</a>
</li>
<li class="file-stats">
<a href="#1c15a6aace19eeee82d5f697ccb72add50cbe239">
<span class="deleted-file">
−
3rdparty/quazip-0.7/CMakeLists.txt
</span>
</a>
</li>
<li class="file-stats">
<a href="#687f10092280160ada78812227b212198428e56e">
<span class="deleted-file">
−
3rdparty/quazip-0.7/COPYING
</span>
</a>
</li>
<li class="file-stats">
<a href="#a94c2f7a36972068c527e97e52611157fab15d3a">
<span class="deleted-file">
−
3rdparty/quazip-0.7/Doxyfile
</span>
</a>
</li>
<li class="file-stats">
<a href="#333209dbd1b99a223b3aa43938c2fa99f3ded44c">
<span class="deleted-file">
−
3rdparty/quazip-0.7/FindQuaZip.cmake
</span>
</a>
</li>
<li class="file-stats">
<a href="#54670e0afc6c4993c885a7d3933fe29018c99cb5">
<span class="deleted-file">
−
3rdparty/quazip-0.7/NEWS.txt
</span>
</a>
</li>
<li class="file-stats">
<a href="#4381300d0a5ca088f9f83d5d6956da830ddf8511">
<span class="deleted-file">
−
3rdparty/quazip-0.7/README.txt
</span>
</a>
</li>
<li class="file-stats">
<a href="#7a0d7501f629743695a3fcd9fa9a8eceafa3496d">
<span class="deleted-file">
−
3rdparty/quazip-0.7/doc/html/JlCompress_8h_source.html
</span>
</a>
</li>
<li class="file-stats">
<a href="#d47ff5f2d94cc36c83d3ac986914bc92d76d2ad8">
<span class="deleted-file">
−
3rdparty/quazip-0.7/doc/html/annotated.html
</span>
</a>
</li>
<li class="file-stats">
<a href="#a1ccc59341e8311834b9dd20134542acf7ec9cb6">
<span class="deleted-file">
−
3rdparty/quazip-0.7/doc/html/bc_s.png
</span>
</a>
</li>
<li class="file-stats">
<a href="#1fffb757bc43d6f24426dea4303a2292f90e9dc2">
<span class="deleted-file">
−
3rdparty/quazip-0.7/doc/html/bdwn.png
</span>
</a>
</li>
<li class="file-stats">
<a href="#a5814a54983371bf2af9706eda9c0aa34f9124ab">
<span class="deleted-file">
−
3rdparty/quazip-0.7/doc/html/classJlCompress-members.html
</span>
</a>
</li>
</ul>
<h5>The diff was not included because it is too large.</h5>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #777;">
—
<br>
<a href="https://salsa.debian.org/debian-gis-team/merkaartor/compare/ad4e2c29129848e6926555786678ab03b9c5d217...25e98d5f5305878474c85d1187ea400fde1a7f0f">View it on GitLab</a>.
<br>
You're receiving this email because of your account on salsa.debian.org.
If you'd like to receive fewer emails, you can
adjust your notification settings.
</p>
</div>
</body>
</html>