Merge branch 'DEVEL-1.2' into master

diff --git a/libtorrent-rasterbar.spec b/libtorrent-rasterbar.spec
index 23e7b21bef92f6f2854376ac0ebc7e556ac22182..427358c06867d448c2da4c803235100117d7175e 100644 (file)
--- a/libtorrent-rasterbar.spec
+++ b/libtorrent-rasterbar.spec
@@ -1,4 +1,4 @@
-# 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