From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Fri, 31 Jul 2020 20:22:21 +0000 (+0200)
Subject: Merge branch 'DEVEL-1.2' into master
X-Git-Tag: auto/th/libtorrent-rasterbar-1.2.7-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=344936aaacb5d2ebac46cfa71e98a832b1082560;p=packages%2Flibtorrent-rasterbar.git

Merge branch 'DEVEL-1.2' into master
---

344936aaacb5d2ebac46cfa71e98a832b1082560
diff --cc libtorrent-rasterbar.spec
index 7826069,23e7b21..427358c
--- a/libtorrent-rasterbar.spec
+++ b/libtorrent-rasterbar.spec
@@@ -1,4 -1,4 +1,4 @@@
- # WARNING: qbittorrent 3.x uses 1.0.x (libtorrent-1.0 branch), 4.x 1.1.x (master), there is no version ready for 1.2.x (DEVEL-1.2 branch)
 -# WARNING: qbittorrent 4.1.x uses libtorrent-rasterbar 1.1.x (master), 4.2.x allows 1.2.x (DEVEL-1.2 branch)
++# WARNING: qbittorrent 4.1.x uses 1.1.x/1.2.x, not 2.x
  #
  %define		tagver	%(echo %{version} | tr . _)
  Summary:	A C++ BitTorrent library